- ResourceBaseForm typo: missing comma on 'was_approved' field

GeoNode · Mar 22, 2022 · 05e19c2 · 05e19c2
1 parent 814e780
commit 05e19c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/geonode/base/forms.py b/geonode/base/forms.py
@@ -567,7 +567,7 @@ class Meta:
             'tkeywords',
             'users_geolimits',
             'groups_geolimits',
-            'dirty_state'
+            'dirty_state',
             'was_approved',
             'was_published'
         )

diff --git a/geonode/base/models.py b/geonode/base/models.py
@@ -1084,6 +1084,9 @@ def save(self, notify=False, *args, **kwargs):
                 self.polymorphic_ctype.model:
             self.resource_type = self.polymorphic_ctype.model.lower()
 
+        # Resource Updated
+        _notification_sent = False
+        _approval_status_changed = False
         if hasattr(self, 'class_name') and (self.pk is None or notify):
             if self.pk is None and (self.title or getattr(self, 'name', None)):
                 # Resource Created
@@ -1093,10 +1096,6 @@ def save(self, notify=False, *args, **kwargs):
                 recipients = get_notification_recipients(notice_type_label, resource=self)
                 send_notification(recipients, notice_type_label, {'resource': self})
             elif self.pk:
-                # Resource Updated
-                _notification_sent = False
-                _approval_status_changed = False
-
                 # Approval Notifications Here
                 if self.was_approved != self.is_approved:
                     if not _notification_sent and not self.was_approved and self.is_approved:
@@ -1125,12 +1124,12 @@ def save(self, notify=False, *args, **kwargs):
                     recipients = get_notification_recipients(notice_type_label, resource=self)
                     send_notification(recipients, notice_type_label, {'resource': self})
 
-                # Update workflow permissions
-                if _approval_status_changed:
-                    self.set_permissions()
-
         super().save(*args, **kwargs)
 
+        # Update workflow permissions
+        if _approval_status_changed:
+            self.set_permissions()
+
     def delete(self, notify=True, *args, **kwargs):
         """
         Send a notification when a layer, map or document is deleted

diff --git a/geonode/layers/forms.py b/geonode/layers/forms.py
@@ -16,8 +16,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #########################################################################
-
-from geonode.base.forms import ResourceBaseForm
 import os
 import tempfile
 import zipfile
@@ -30,6 +28,7 @@
 
 import json
 from geonode.utils import unzip_file
+from geonode.base.forms import ResourceBaseForm
 from geonode.layers.models import Layer, Attribute