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
e09ff151
Commit
e09ff151
authored
1 year ago
by
Nico Vermaas
Browse files
Options
Downloads
Patches
Plain Diff
bugfix: return to details screen after discard from that page
parent
73b171fa
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#54891
passed
1 year 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/templates/taskdatabase/tasks/set_status_buttons.html
+1
-1
1 addition, 1 deletion
...base/templates/taskdatabase/tasks/set_status_buttons.html
atdb/taskdatabase/views.py
+4
-1
4 additions, 1 deletion
atdb/taskdatabase/views.py
with
5 additions
and
2 deletions
atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html
+
1
−
1
View file @
e09ff151
...
...
@@ -9,7 +9,7 @@
<a
href=
"{% url 'task-details-setstatus' task.pk 'archived' %}"
class=
"btn btn-warning btn-sm"
role=
"button"
><i
class=
"fas fa-sync-alt"
></i>
archived
</a>
<a
href=
"{% url 'task-details-setstatus' task.pk 'finished' %}"
class=
"btn btn-warning btn-sm"
role=
"button"
><i
class=
"fas fa-sync-alt"
></i>
finished
</a>
<a
href=
"{% url 'task-details-setstatus' task.pk 'suspended' %}"
class=
"btn btn-warning btn-sm"
role=
"button"
><i
class=
"fas fa-sync-alt"
></i>
suspended
</a>
<a
href=
"{% url 'task-discard-view' task.pk 'discard'
1
%}"
class=
"btn btn-danger btn-sm"
role=
"button"
><i
class=
"fas fa-trash-alt"
></i>
Discard
</a>
<a
href=
"{% url 'task-discard-view' task.pk 'discard'
0
%}"
class=
"btn btn-danger btn-sm"
role=
"button"
><i
class=
"fas fa-trash-alt"
></i>
Discard
</a>
<!--
<a href="{% url 'task-details-setstatus' task.pk 'discard' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> discard</a>
...
...
This diff is collapsed.
Click to expand it.
atdb/taskdatabase/views.py
+
4
−
1
View file @
e09ff151
...
...
@@ -1177,7 +1177,10 @@ def TaskDiscard(request, pk, new_status, page=0):
task
.
save
()
# return to the failures page
return
redirect_with_params
(
'
failures
'
,
'
?page=
'
+
page
)
if
int
(
page
)
==
0
:
return
redirect
(
'
task-details
'
)
else
:
return
redirect_with_params
(
'
failures
'
,
'
?page=
'
+
page
)
else
:
# a GET means that the form should be presented to be filled in
...
...
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