metadata_list pulls most recent, removed project text on metadata upload screen

Author: ltuite96

ingest/templates/ingest/descriptive_metadata_upload.html

@@ -26,8 +26,7 @@ <h3>Step 3 of 3: Upload metadata for associated submission</h3>
 {% if collections %}
 <ul class="list-group">
   <li class="list-group-item">Download and fill out either the <a href="{% static 'ingest/BILMetadataV2Template.xlsx' %}">Excel</a> or <a href="{% static '/ingest/BILMetadataV2Template.ods' %}">LibreOffice Calc</a> template. </li>
-  <li class="list-group-item">Choose a collection, then upload your metadata.</li>.
-  <p> If the project you are looking for is not in this list, it must be added by the PI of your project. </p>
+  <li class="list-group-item">Choose a collection, then upload your metadata.</li>
 </ul>
   <hr>  
     {% csrf_token %}

ingest/views.py

@@ -418,9 +418,10 @@ def descriptive_metadata_list(request):
         datasets_list = []
         collections = Collection.objects.filter(user=request.user)
         for c in collections:
-            sheets = Sheet.objects.filter(collection_id=c.id).all()
-            for s in sheets:
-                datasets = Dataset.objects.filter(sheet_id=s.id)
+            sheets = Sheet.objects.filter(collection_id=c.id).last()
+            #for s in sheets:
+            if sheets != None:
+                datasets = Dataset.objects.filter(sheet_id=sheets.id)
                 for d in datasets:
                     datasets_list.append(d)