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

Prevent changing package type once approved

Browse Source 
Fixes #547
This commit is contained in:
rubenwardy 2024-07-03 18:06:10 +01:00
parent 56f45510dd
commit ed69a871a5
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/logic/packages.py
View File

@ -23,7 +23,7 @@ from flask_babel import lazy_gettext, LazyString
from app.logic.LogicError import LogicError from app.logic.LogicError import LogicError
from app.models import User, Package, PackageType, MetaPackage, Tag, ContentWarning, db, Permission, AuditSeverity, \ from app.models import User, Package, PackageType, MetaPackage, Tag, ContentWarning, db, Permission, AuditSeverity, \
License, PackageDevState License, PackageDevState, PackageState
from app.utils import add_audit_log, has_blocked_domains, diff_dictionaries, describe_difference, normalize_line_endings from app.utils import add_audit_log, has_blocked_domains, diff_dictionaries, describe_difference, normalize_line_endings
from app.utils.url import clean_youtube_url from app.utils.url import clean_youtube_url
@ -131,7 +131,13 @@ def do_edit_package(user: User, package: Package, was_new: bool, was_web: bool,
raise LogicError(403, lazy_gettext("Linking to blocked sites is not allowed")) raise LogicError(403, lazy_gettext("Linking to blocked sites is not allowed"))
if "type" in data: if "type" in data:
data["type"] = PackageType.coerce(data["type"]) new_type = PackageType.coerce(data["type"])
if new_type == package.type:
pass
elif package.state != PackageState.APPROVED:
package.type = new_type
else:
raise LogicError(403, lazy_gettext("You cannot change package type once approved"))
if "dev_state" in data: if "dev_state" in data:
data["dev_state"] = PackageDevState.coerce(data["dev_state"]) data["dev_state"] = PackageDevState.coerce(data["dev_state"])

7
app/templates/packages/create_edit.html
View File

@ -66,7 +66,12 @@
<legend>{{ _("Package") }}</legend> <legend>{{ _("Package") }}</legend>
<div class="row"> <div class="row">
{{ render_field(form.type, class_="pkg_meta col-sm-3") }} {% if package and package.approved %}
{{ render_field(form.type, class_="pkg_meta col-sm-3", disabled=True) }}
<input type="hidden" name="type" value="{{ form.type.data.to_name() }}">
{% else %}
{{ render_field(form.type, class_="pkg_meta col-sm-3") }}
{% endif %}
{{ render_field(form.title, class_="pkg_meta col-sm-5") }} {{ render_field(form.title, class_="pkg_meta col-sm-5") }}
{% if package and package.approved and not package.check_perm(current_user, "CHANGE_NAME") %} {% if package and package.approved and not package.check_perm(current_user, "CHANGE_NAME") %}
{{ render_field(form.name, class_="pkg_meta col-sm-4", {{ render_field(form.name, class_="pkg_meta col-sm-4",