diff --git a/atdb/atdb/settings/base.py b/atdb/atdb/settings/base.py index 7f1882103408201ec2991a3f17ee080745ea939f..44ee30e981054689d74b66d045b2be17330fdd98 100644 --- a/atdb/atdb/settings/base.py +++ b/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'] diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index f1b3bd958655ddfae5b59188595452c1ba342891..59bb7dc12aa3081ad2b029c2c0dfdb661d43af73 100644 --- a/atdb/taskdatabase/models.py +++ b/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) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 28aae03a0b259f9b120d6874032734cb3808b22c..baecfcb379291d5ddc2f4306a26452a032b0ddae 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/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>