Merge pull request #609 from NASA-IMPACT/bugfix/multi-dependents

Bugfix/multiple unpublished dependents

app/admg_webapp/contrib/sites/migrations/0003_set_site_domain_and_name.py

@@ -3,6 +3,7 @@
 
 http://cookiecutter-django.readthedocs.io/en/latest/faq.html#why-is-there-a-django-contrib-sites-directory-in-cookiecutter-django
 """
+
 from django.conf import settings
 from django.db import migrations
 

app/admin_ui/admin/data_models.py

@@ -30,8 +30,7 @@
 @admin.register(models.GcmdPhenomenon)
 @admin.register(models.WebsiteType)
 @admin.register(models.Website)
-class BasicAdmin(admin.ModelAdmin, EnforcedPermissionsMixin):
-    ...
+class BasicAdmin(admin.ModelAdmin, EnforcedPermissionsMixin): ...
 
 
 @admin.register(models.CollectionPeriod)

app/admin_ui/templates/snippets/dependent_drafts.html

@@ -1,7 +1,7 @@
-{% regroup descendents by view_model as grouped_descendents %}
+{% regroup descendents by content_type as grouped_descendents %}
 <ul class="list-unstyled">
   {% for model_type in grouped_descendents %}
-  <li class="font-weight-bold">{{ model_type.grouper }}</li>
+  <li class="font-weight-bold">{{ model_type.grouper.model | capfirst }}</li>
   <ul>
       {% for instance in model_type.list %}
       <li>

app/admin_ui/views/v2.py

@@ -12,6 +12,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.views.generic.edit import UpdateView
 from django.db.models import OuterRef, Subquery
+from django.db.models.functions import Coalesce
 from django.views.generic.edit import CreateView
 from django_filters.views import FilterView
 from django_tables2 import SingleTableView, SingleTableMixin
@@ -651,8 +652,13 @@ def get_object(self, queryset=None):
     def _filter_latest_changes(change_queryset):
         """Returns the single latest Change draft for each model_instance_uuid in the
         provided queryset."""
-        return change_queryset.order_by('model_instance_uuid', '-approvallog__date').distinct(
-            'model_instance_uuid'
+        # Using Coalesce to handle the case where model_instance_uuid is None,
+        # since distinct will treat NULLs as equal.
+        # Using `cid` rather than `canonical_uuid` to avoid a name conflict on the model
+        return (
+            change_queryset.annotate(cid=Coalesce("model_instance_uuid", "uuid"))
+            .order_by('cid', '-approvallog__date')
+            .distinct('cid')
         )
 
     def get_context_data(self, **kwargs):

app/config/urls.py

@@ -14,7 +14,7 @@
     path("accounts/", include("allauth.urls")),
     path("api/", include("api_app.urls")),
     path("authenticate/token/", CustomTokenView.as_view(), name="token"),
-    path("authenticate/", include("oauth2_provider.urls"), name="oauth2_provider")
+    path("authenticate/", include("oauth2_provider.urls"), name="oauth2_provider"),
     # Your stuff: custom urls includes go here
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

app/config/wsgi.py

@@ -13,6 +13,7 @@
 framework.
 
 """
+
 import os
 import sys