Merge branch 'hack-on-hold-when-stored' into 'master'

task goes 'on hold' when status goes to 'scrubbed'

See merge request !284

atdb/atdb/settings/base.py

@@ -205,8 +205,8 @@ LOGOUT_REDIRECT_URL = FORCE_SCRIPT_NAME + 'atdb'
 STATIC_URL = FORCE_SCRIPT_NAME + 'atdb/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
-ALL_STATUSSES = ['defining','defined','staging','staged','processing','processed','storing','stored','validated', 'archiving','archived','finished']
-ACTIVE_STATUSSES = ['staging','staged','processing','processed','validated','storing','stored','archiving','archived']
+ALL_STATUSSES = ['defining','defined','staging','staged','processing','processed','storing','stored','scrubbing','scrubbed','validated', 'archiving','archived','finished']
+ACTIVE_STATUSSES = ['staging','staged','processing','processed','validated','storing','stored','scrubbing','scrubbed','archiving','archived']
 STATUSSES_WITH_DATA = ['staged','fetching','fetched','processing','processed','validated','storing','stored','scrubbing','scrubbed','archiving','archived']
 AGGREGATES = ['failed','active','total']
 

atdb/taskdatabase/models.py

@@ -109,7 +109,7 @@ class Task(models.Model):
         # nv:1mar2023, temporary hack, set tasks 'on hold' as soon they get to 'stored'
         # (users forget to do that manually, causing unwanted ingests)
 
-        if (self.status != 'stored') & (self.new_status == 'stored'):
+        if (self.status != 'scrubbed') & (self.new_status == 'scrubbed'):
             self.resume = False
 
         super(Task, self).save(*args, **kwargs)

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -34,7 +34,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 1 March 2023
+    <p class="footer"> Version 3 March 2023
 
 </div>