Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2025-01-03 11:47:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix edit release infinite redirection

Browse Source
This commit is contained in:
rubenwardy 2018-05-23 19:17:44 +01:00
parent bd2e7e7a46
commit fb22408794
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/templates/packages/release_edit.html
View File

@ -21,6 +21,15 @@
Url: <a href="{{ release.url }}">{{ release.url }}</a><br /> Url: <a href="{{ release.url }}">{{ release.url }}</a><br />
{% endif %} {% endif %}
{% if release.task_id %}
Importing... <a href="{ url_for('check_task', id=release.task_id, r=release.getEditURL()) }}">view task</a><br />
{% if package.checkPerm(current_user, "CHANGE_RELEASE_URL") %}
{{ render_field(form.task_id) }}
{% endif %}
<br />
{% endif %}
{% if package.checkPerm(current_user, "APPROVE_RELEASE") %} {% if package.checkPerm(current_user, "APPROVE_RELEASE") %}
{{ render_field(form.approved) }} {{ render_field(form.approved) }}
{% else %} {% else %}

9
app/views/packages.py
View File

@ -396,6 +396,7 @@ class EditPackageReleaseForm(FlaskForm):
name = StringField("Name") name = StringField("Name")
title = StringField("Title") title = StringField("Title")
url = StringField("URL", [URL]) url = StringField("URL", [URL])
task_id = StringField("Task ID")
approved = BooleanField("Is Approved") approved = BooleanField("Is Approved")
submit = SubmitField("Save") submit = SubmitField("Save")
@ -422,7 +423,7 @@ def create_release_page(package):
triggerNotif(package.author, current_user, msg, rel.getEditURL()) triggerNotif(package.author, current_user, msg, rel.getEditURL())
db.session.commit() db.session.commit()
return redirect(url_for("check_task", id=rel.task_id, r=package.getDetailsURL())) return redirect(url_for("check_task", id=rel.task_id, r=rel.getEditURL()))
else: else:
uploadedPath = doFileUpload(form.fileUpload.data, ["zip"], "a zip file") uploadedPath = doFileUpload(form.fileUpload.data, ["zip"], "a zip file")
if uploadedPath is not None: if uploadedPath is not None:
@ -454,9 +455,6 @@ def edit_release_page(package, id):
if not (canEdit or canApprove): if not (canEdit or canApprove):
return redirect(package.getDetailsURL()) return redirect(package.getDetailsURL())
if release.task_id is not None:
return redirect(url_for("check_task", id=release.task_id, r=release.getEditURL()))
# Initial form class from post data and default data # Initial form class from post data and default data
form = EditPackageReleaseForm(formdata=request.form, obj=release) form = EditPackageReleaseForm(formdata=request.form, obj=release)
if request.method == "POST" and form.validate(): if request.method == "POST" and form.validate():
@ -466,6 +464,9 @@ def edit_release_page(package, id):
if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL): if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL):
release.url = form["url"].data release.url = form["url"].data
release.task_id = form["task_id"].data
if release.task_id.strip() == "":
release.task_id = None
if canApprove: if canApprove:
release.approved = form["approved"].data release.approved = form["approved"].data