Merge branch 'develop' into uat

salsadigitalauorg · May 19, 2022 · 73f02ef · 73f02ef
2 parents b68f9bb + b250df4
commit 73f02ef
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/ckanext/vocabulary_services/logic/action/create.py b/ckanext/vocabulary_services/logic/action/create.py
@@ -48,7 +48,8 @@ def vocabulary_service_term_create(context, data_dict):
         label=data_dict.get('label', ''),
         uri=data_dict.get('uri', ''),
         broader=data_dict.get('broader', ''),
-        definition=data_dict.get('definition', '')
+        definition=data_dict.get('definition', ''),
+        quantity_kind=data_dict.get('quantity_kind', '')
     )
 
     session.add(term)
@@ -82,11 +83,11 @@ def vocabulary_service_term_upsert(context, data_dict):
 
         if existing_term:
             # Check if something has changed - if so, update it, otherwise skip it...
-            if (existing_term.label != label
-                  or existing_term.uri != uri
-                  or existing_term.definition != definition
-                  or existing_term.broader != broader
-                  or existing_term.quantity_kind != quantity_kind):
+            if (existing_term.label != label or
+                existing_term.uri != uri or
+                existing_term.definition != definition or
+                existing_term.broader != broader or
+                existing_term.quantity_kind != quantity_kind):
                 # Update the term
                 existing_term.label = label
                 existing_term.uri = uri