Skip to content
Snippets Groups Projects
Commit 9304141b authored by Nico Vermaas's avatar Nico Vermaas
Browse files

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

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

See merge request !284
parents 2cdaed49 7a0f66d7
No related branches found
No related tags found
1 merge request!284task goes 'on hold' when status goes to 'scrubbed'
Pipeline #45193 passed
...@@ -205,8 +205,8 @@ LOGOUT_REDIRECT_URL = FORCE_SCRIPT_NAME + 'atdb' ...@@ -205,8 +205,8 @@ LOGOUT_REDIRECT_URL = FORCE_SCRIPT_NAME + 'atdb'
STATIC_URL = FORCE_SCRIPT_NAME + 'atdb/static/' STATIC_URL = FORCE_SCRIPT_NAME + 'atdb/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_ROOT = os.path.join(BASE_DIR, 'static')
ALL_STATUSSES = ['defining','defined','staging','staged','processing','processed','storing','stored','validated', 'archiving','archived','finished'] 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','archiving','archived'] 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'] STATUSSES_WITH_DATA = ['staged','fetching','fetched','processing','processed','validated','storing','stored','scrubbing','scrubbed','archiving','archived']
AGGREGATES = ['failed','active','total'] AGGREGATES = ['failed','active','total']
......
...@@ -109,7 +109,7 @@ class Task(models.Model): ...@@ -109,7 +109,7 @@ class Task(models.Model):
# nv:1mar2023, temporary hack, set tasks 'on hold' as soon they get to 'stored' # nv:1mar2023, temporary hack, set tasks 'on hold' as soon they get to 'stored'
# (users forget to do that manually, causing unwanted ingests) # (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 self.resume = False
super(Task, self).save(*args, **kwargs) super(Task, self).save(*args, **kwargs)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</div> </div>
<p class="footer"> Version 1 March 2023 <p class="footer"> Version 3 March 2023
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment