Merge pull request #493 from pierotofy/oam-upload

Added PluginDatum in administration panel
OpenDroneMap · Jul 30, 2018 · 43b78be · 43b78be
2 parents d49ae23 + 366aa82
commit 43b78be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/admin.py b/app/admin.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from guardian.admin import GuardedModelAdmin
 
+from app.models import PluginDatum
 from app.models import Preset
 from .models import Project, Task, ImageUpload, Setting, Theme
 from django import forms
@@ -59,4 +60,6 @@ class ThemeAdmin(admin.ModelAdmin):
     form = ThemeModelForm
 
 
-admin.site.register(Theme, ThemeAdmin)
+admin.site.register(Theme, ThemeAdmin)
+
+admin.site.register(PluginDatum, admin.ModelAdmin)
diff --git a/app/models/task.py b/app/models/task.py
@@ -351,11 +351,10 @@ def process(self):
                         # We don't care if this fails (we tried)
                         try:
                             self.processing_node.cancel_task(self.uuid)
-                            self.status = None
                         except ProcessingException:
                             logger.warning("Could not cancel {} on processing node. We'll proceed anyway...".format(self))
-                            self.status = status_codes.CANCELED
 
+                        self.status = status_codes.CANCELED
                         self.pending_action = None
                         self.save()
                     else: