diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py index bcfb2259938d4afb9128bb1b94500e8b2a97b4a3..43608c906e122981a15cec2fdabfc8b8829eb61d 100644 --- a/atdb/atdb/settings/dev.py +++ b/atdb/atdb/settings/dev.py @@ -2,6 +2,7 @@ from atdb.settings.base import * import os # SECURITY WARNING: don't run with debug turned on in production! +DEV = True DEBUG = True ALLOWED_HOSTS = ["*"] diff --git a/atdb/atdb/settings/docker_sdc.py b/atdb/atdb/settings/docker_sdc.py index 24bd00da07d08bd5f2cae67b5ec55249a9b822ce..f507dcbc1193c23168a8d6444ecf80d3a9cffc39 100644 --- a/atdb/atdb/settings/docker_sdc.py +++ b/atdb/atdb/settings/docker_sdc.py @@ -2,6 +2,7 @@ from atdb.settings.base import * import os # Import production setting must remain False. +DEV = False try: DEBUG = os.environ['DEBUG'] except: diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index a31dbf7382fa5b21568cc5354b19337f28ececa1..631e073529fb87aed02abcb952eabbcfed9e62ea 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -201,10 +201,12 @@ def aggregate_resources_tasks(): def construct_link(request, status, workflow_id, count): link = str(count) try: - query = "?status=" + status + "&workflow=" + str(workflow_id) - url = "https://" +request.build_absolute_uri('/atdb/tasks') + query - if not "http" in url: - url = "https://" + url + query = "?status=" + status + "&workflow__id=" + str(workflow_id) + #if settings.DEV == False: + # url = "https://" +request.build_absolute_uri('/atdb/tasks') + query + #else: + #TODO: this doesn't work yet in production + url = request.scheme + "://" + request.get_host() + '/atdb/tasks' + query link = '<a href="' + url + '" target="_blank">' + str(count) + "</a>" except: pass diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 4f5157bc1ae027cfe1191e18277b1fb99eb4ded9..f17bad36383adef65b35f8106db37e6d2f02baf1 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -80,7 +80,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (12 mar 2021 - 17:00) + <p class="footer"> Version 1.0.0 (12 mar 2021 - 21:00) </div>