Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
atdb-ldv
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ASTRON SDC
atdb-ldv
Commits
ba716f1a
Commit
ba716f1a
authored
2 years ago
by
Nico Vermaas
Browse files
Options
Downloads
Patches
Plain Diff
task goes 'on hold' when status goes to 'stored'
parent
1ab5a2a3
No related branches found
Branches containing commit
No related tags found
1 merge request
!283
task goes 'on hold' when status goes to 'stored'
Pipeline
#44995
passed
2 years ago
Stage: build
Stage: deploy_to_test
Stage: deploy_to_production
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
atdb/taskdatabase/models.py
+10
-0
10 additions, 0 deletions
atdb/taskdatabase/models.py
atdb/taskdatabase/templates/taskdatabase/index.html
+1
-1
1 addition, 1 deletion
atdb/taskdatabase/templates/taskdatabase/index.html
with
11 additions
and
1 deletion
atdb/taskdatabase/models.py
+
10
−
0
View file @
ba716f1a
...
@@ -105,6 +105,16 @@ class Task(models.Model):
...
@@ -105,6 +105,16 @@ class Task(models.Model):
def
__str__
(
self
):
def
__str__
(
self
):
return
str
(
self
.
id
)
+
'
- (
'
+
self
.
task_type
+
'
) -
'
+
str
(
self
.
sas_id
)
return
str
(
self
.
id
)
+
'
- (
'
+
self
.
task_type
+
'
) -
'
+
str
(
self
.
sas_id
)
def
save
(
self
,
*
args
,
**
kwargs
):
# 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
'
):
self
.
resume
=
False
super
(
Task
,
self
).
save
(
*
args
,
**
kwargs
)
# this translates a view-name (from urls.py) back to a url, to avoid hardcoded url's in the html templates
# this translates a view-name (from urls.py) back to a url, to avoid hardcoded url's in the html templates
# bad : <td><a href="/atdb/tasks/{{ task.id }}/" target="_blank">{{ task.taskID }} </a> </td>
# bad : <td><a href="/atdb/tasks/{{ task.id }}/" target="_blank">{{ task.taskID }} </a> </td>
# good: <td><a href="{{ task.get_absolute_url }}" target="_blank">{{ task.taskID }} </a> </td>
# good: <td><a href="{{ task.get_absolute_url }}" target="_blank">{{ task.taskID }} </a> </td>
...
...
This diff is collapsed.
Click to expand it.
atdb/taskdatabase/templates/taskdatabase/index.html
+
1
−
1
View file @
ba716f1a
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %}
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
</div>
</div>
<p
class=
"footer"
>
Version
27 Februari
2023
<p
class=
"footer"
>
Version
1 March
2023
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment