'deleted' changed to 'removed'. Gianmarco pointed out this error.

ExCiteS · Aug 23, 2018 · 7faf319 · 7faf319
1 parent 5562a16
commit 7faf319
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/geokey_wegovnow/logger.py b/geokey_wegovnow/logger.py
@@ -99,6 +99,10 @@ def make_event(class_name, instance, action):
     activity_objects = []
     visibility_details = []
     details = {}
+    if action == 'removed' or instance.isprivate or instance.status != 'active':
+        hidden = True
+    else:
+        hidden = False
 
     # ###########################
     # ADDITIONS FOR PROJECT
@@ -108,11 +112,6 @@ def make_event(class_name, instance, action):
         external_url = '%s/api/projects/%s/' % (
             domain, instance.id)
 
-        if action == 'deleted' or instance.isprivate:
-            hidden = True
-        else:
-            hidden = instance.status == 'active'
-
         activity_objects.append({
             'type': 'Feature',
             'geometry': None,
@@ -140,7 +139,8 @@ def make_event(class_name, instance, action):
     if class_name == 'Category':
         external_url = '%s/api/projects/%s/categories/%s/' % (
             domain, instance.project.id, instance.id)
-        hidden = True if action == 'deleted' or instance.project.isprivate else instance.status == 'active'
+        if instance.project.isprivate:
+            hidden = True
 
         activity_objects.append({
             'type': 'Feature',
@@ -170,17 +170,14 @@ def make_event(class_name, instance, action):
     if class_name == 'Observation':
         external_url = '%s/api/projects/%s/contributions/%s/' % (
             domain, instance.project.id, instance.id)
-        hidden = True if action == 'deleted' or instance.project.isprivate else instance.status == 'active'
+        if instance.project.isprivate:
+            hidden = True
 
         geometry = literal_eval(instance.location.geometry.geojson)
         additional_properties = literal_eval(json.dumps(instance.properties))
-        properties = {
-            'hasType': 'Contribution',
-            'external_url': make_cm_url(external_url),
-            'additionalProperties': additional_properties
-        }
-        if action != 'deleted':
-            properties['name'] = get_link_title(properties=instance.properties)
+        properties = {'hasType': 'Contribution', 'external_url': make_cm_url(external_url),
+                      'additionalProperties': additional_properties,
+                      'name': get_link_title(properties=instance.properties)}
 
         activity_objects.append({
             'type': 'Feature',
@@ -206,7 +203,8 @@ def make_event(class_name, instance, action):
 
         external_url = '%s/api/projects/%s/contributions/%s/comments' % (
             domain, contribution.project.id, contribution.id)
-        hidden = True if action == 'deleted' or instance.project.isprivate else instance.status == 'active'
+        if instance.project.isprivate:
+            hidden = True
 
         activity_objects.append({
             'type': 'Feature',
@@ -241,7 +239,8 @@ def make_event(class_name, instance, action):
 
         external_url = '%s/api/projects/%s/contributions/%s/media/%s' % (
             domain, contribution.project.id, contribution.id, instance.id)
-        hidden = True if action == 'deleted' or instance.project.isprivate else instance.status == 'active'
+        if instance.project.isprivate:
+            hidden = True
 
         if hasattr(instance, 'audio'):
             url = domain + instance.audio.url

diff --git a/geokey_wegovnow/models.py b/geokey_wegovnow/models.py
@@ -26,7 +26,7 @@ def log_on_pre_save(sender, instance, **kwargs):
                 events.append(make_event(
                     instance._class_name,
                     instance,
-                    'deleted'))
+                    'removed'))
                 instance._logged = True
             else:
                 try: