Hot fix on collection matching error in views. Added google analytics to base.html. Additional filters on admin.py.

ropelews · ropelews · commit bf9d61c6b725 · 2022-05-19T11:44:59.000-04:00
diff --git a/ingest/admin.py b/ingest/admin.py
@@ -97,10 +97,10 @@ class Image(admin.ModelAdmin):
 class SheetAdmin(admin.ModelAdmin):
     list_display = ("id","filename", "date_uploaded", "collection")
     inlines = [ContributorsInline, FundersInline, PublicationsInline, InstrumentsInline, SpecimensInline, DatasetsInline, ImagesInline, ]
-
 @admin.register(EventsLog)
 class EventsLogAdmin(admin.ModelAdmin):
     list_display = ("collection_id", "notes", "event_type","timestamp")
+    list_filter = ('event_type','timestamp')
 @admin.register(ProjectPeople)
 class ProjectPeople(admin.ModelAdmin):
     list_display = ("id", "project_id", "people_id", "is_po", "is_po", "doi_role")
diff --git a/ingest/templates/ingest/base.html b/ingest/templates/ingest/base.html
@@ -2,7 +2,15 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-JB1L53FVNL"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
+  gtag('config', 'G-JB1L53FVNL');
+</script>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
   <!-- Latest compiled and minified CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
diff --git a/ingest/views.py b/ingest/views.py
@@ -2076,10 +2076,14 @@ def save_all_sheets_method_2(instruments, specimen_set, images, datasets, sheet,
                 if saved_specimens:
                     saved_images = save_images_sheet_method_2(images, sheet, saved_datasets)
                     if saved_images:
+                        #o = open("/tmp/submiterror.txt", "a")
+                        #o.write('save_images is true')
                         saved_generic = save_all_generic_sheets(contributors, funders, publications, sheet)
                         if saved_generic:
+                            #o.write('saved_generic is true')
                             return True
                         else:
+                            #o.write('saved_generic is FALSE')
                             False
                     else:
                         False
@@ -2240,7 +2244,7 @@ def descriptive_metadata_upload(request):
 
                 else:
                     saved = False
-                    collection = Collection.objects.get(name=associated_collection)
+                    collection = Collection.objects.get(name=associated_collection.name)
                     contributors = ingest_contributors_sheet(filename)
                     funders = ingest_funders_sheet(filename)
                     publications = ingest_publication_sheet(filename)
