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

Merge branch 'dev-nico' into 'master'

Dev nico

See merge request !29
parents 30fbf952 4a969db2
No related branches found
No related tags found
3 merge requests!34Master,!31Master,!29Dev nico
Pipeline #9838 passed
......@@ -113,6 +113,7 @@ This is the procedure for that.
> python manage.py migrate --settings=atdb.settings.dev
- add new migration file to git
- commit & push
- apply 'The Procedure' (see above) to deploy in test, acceptance and production.
on CI/CD page: https://git.astron.nl/astron-sdc/atdb-ldv/-/pipelines
......@@ -121,6 +122,7 @@ This is the procedure for that.
on 'test', 'acc' and 'prod' machine's:
> docker exec -it atdb-ldv python manage.py makemigrations --settings atdb.settings.docker_sdc
(this should say 'No changes detected', but do this step anyway as a check)
> docker exec -it atdb-ldv python manage.py migrate --settings atdb.settings.docker_sdc
......
......@@ -27,7 +27,7 @@ class Task(models.Model):
resume = models.BooleanField(default=True)
creationTime = models.DateTimeField(default=datetime.utcnow, blank=True)
priority = models.IntegerField(default=1, null=True)
priority = models.IntegerField(default=100, null=True)
purge_policy = models.CharField(max_length=5, default="no", blank=True, null=True)
stage_request_id = models.IntegerField(null=True)
......
......@@ -45,7 +45,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
<p class="footer"> Version 1.0.0 (25 feb 2021 - 7:00)
<p class="footer"> Version 1.0.0 (25 feb 2021 - 10:00)
<script type="text/javascript">
(function(seconds) {
var refresh,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment