Add staff user to profiles that can modify a DS

portal/forms.py

@@ -280,7 +280,7 @@ class DataSetForm(forms.ModelForm):
         is_valid = super().is_valid()
         if not is_valid:
             return is_valid
-        elif self.instance.id: # Apply only to DS update
+        elif self.instance.id and self.request_profile: # Apply only to DS update
             is_valid = self.instance in DataSet.objects.writable_by_profile(self.request_profile)
         return is_valid
 

portal/models.py

@@ -307,16 +307,18 @@ class DataSetManager(models.Manager):
         Created by user
         OR accessible by user AND NOT read-only
         """
-        return super().get_queryset().filter(
-            Q(created_by=profile)
-            | (
-                (
-                    Q(share_profiles=profile)
-                    | Q(share_labs__members=profile)
-                    | Q(share_groups__profiles=profile)
-                ) & Q(read_only=False)
-            )
-        )
+        if profile.user.is_staff:
+            qs = super().get_queryset()
+        else:
+            qs = Q(created_by=profile) \
+                | (
+                    (
+                        Q(share_profiles=profile)
+                        | Q(share_labs__members=profile)
+                        | Q(share_groups__profiles=profile)
+                    ) & Q(read_only=False)
+                )
+        return qs
 
 
 class DataSet(models.Model):