Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
9d01af8b
Verified
Commit
9d01af8b
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Show additional button on Celery progress page only if task doesn't fail
parent
82af2006
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!848
Resolve "PDF files offered for download despite of error"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/static/js/progress.js
+1
-0
1 addition, 0 deletions
aleksis/core/static/js/progress.js
aleksis/core/templates/core/pages/progress.html
+1
-1
1 addition, 1 deletion
aleksis/core/templates/core/pages/progress.html
with
2 additions
and
1 deletion
aleksis/core/static/js/progress.js
+
1
−
0
View file @
9d01af8b
...
...
@@ -47,6 +47,7 @@ function customSuccess(progressBarElement, progressBarMessageElement) {
$
(
"
#result-icon
"
).
text
(
"
check_circle
"
);
$
(
"
#result-text
"
).
text
(
OPTIONS
.
success
);
$
(
"
#result-box
"
).
show
();
$
(
"
#result-button
"
).
show
();
const
redirect
=
"
redirect_on_success
"
in
OPTIONS
&&
OPTIONS
.
redirect_on_success
;
if
(
redirect
)
{
window
.
location
.
replace
(
OPTIONS
.
redirect_on_success
);
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/templates/core/pages/progress.html
+
1
−
1
View file @
9d01af8b
...
...
@@ -47,7 +47,7 @@
{% trans "Go back" %}
</a>
{% if additional_button %}
<a
class=
"btn waves-effect waves-light"
href=
"{{ additional_button.href }}"
>
<a
class=
"btn waves-effect waves-light"
href=
"{{ additional_button.href }}"
id=
"result-button"
style=
"display: none;"
>
<i
class=
"material-icons left"
>
{{ additional_button.icon|default:"" }}
</i>
{{ additional_button.caption }}
</a>
...
...
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