Merge pull request #397 from johnmikep/master

Update utils.py
salopensource · Jul 9, 2020 · 687e40d · 687e40d
2 parents bbe975c + 16af862
commit 687e40d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/utils.py b/server/utils.py
@@ -540,7 +540,8 @@ def get_active_and_inactive_plugins(plugin_kind='machines'):
 def unique_plugin_order(plugin_type='machines'):
     model = PLUGIN_MODELS[plugin_type][0]
     try:
-        id_max = model.objects.aggregate(Max('order'))['order__max']
+        # Return 0 if no machine plugins exist
+        id_max = model.objects.aggregate(Max('order'))['order__max'] or 0
     except KeyError:
         id_max = 0
     return id_max + 1