From 1d48f5dabe6d4fd81e342623022a2269aee606d2 Mon Sep 17 00:00:00 2001 From: Armen Date: Tue, 15 Feb 2022 22:35:01 -0500 Subject: [PATCH] Remove minetest release version requirements from package uploads --- app/blueprints/packages/releases.py | 26 +++++++----------------- app/templates/packages/release_edit.html | 19 ----------------- app/templates/packages/release_new.html | 24 ---------------------- app/templates/users/profile.html | 4 ++-- 4 files changed, 9 insertions(+), 64 deletions(-) diff --git a/app/blueprints/packages/releases.py b/app/blueprints/packages/releases.py index 08c48e3..f17ad20 100644 --- a/app/blueprints/packages/releases.py +++ b/app/blueprints/packages/releases.py @@ -53,10 +53,6 @@ class CreatePackageReleaseForm(FlaskForm): uploadOpt = RadioField(lazy_gettext("Method"), choices=[("upload", lazy_gettext("File Upload"))], default="upload") vcsLabel = StringField(lazy_gettext("Git reference (ie: commit hash, branch, or tag)"), default=None) fileUpload = FileField(lazy_gettext("File Upload")) - min_rel = QuerySelectField(lazy_gettext("Minimum Minetest Version"), [InputRequired()], - query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) - max_rel = QuerySelectField(lazy_gettext("Maximum Minetest Version"), [InputRequired()], - query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) submit = SubmitField(lazy_gettext("Save")) @@ -65,10 +61,6 @@ class EditPackageReleaseForm(FlaskForm): url = StringField(lazy_gettext("URL"), [Optional()]) task_id = StringField(lazy_gettext("Task ID"), filters = [lambda x: x or None]) approved = BooleanField(lazy_gettext("Is Approved")) - min_rel = QuerySelectField(lazy_gettext("Minimum Minetest Version"), [InputRequired()], - query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) - max_rel = QuerySelectField(lazy_gettext("Maximum Minetest Version"), [InputRequired()], - query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) submit = SubmitField(lazy_gettext("Save")) @@ -93,11 +85,9 @@ def create_release(package): if form.validate_on_submit(): try: if form["uploadOpt"].data == "vcs": - rel = do_create_vcs_release(current_user, package, form.title.data, - form.vcsLabel.data, form.min_rel.data.getActual(), form.max_rel.data.getActual()) + rel = do_create_vcs_release(current_user, package, form.title.data, form.vcsLabel.data) else: - rel = do_create_zip_release(current_user, package, form.title.data, - form.fileUpload.data, form.min_rel.data.getActual(), form.max_rel.data.getActual()) + rel = do_create_zip_release(current_user, package, form.title.data, form.fileUpload.data) return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL())) except LogicError as e: flash(e.message, "danger") @@ -158,8 +148,6 @@ def edit_release(package, id): if form.validate_on_submit(): if canEdit: release.title = form["title"].data - release.min_rel = form["min_rel"].data.getActual() - release.max_rel = form["max_rel"].data.getActual() if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL): release.url = form["url"].data @@ -205,11 +193,11 @@ def bulk_change_release(package): elif form.validate_on_submit(): only_change_none = form.only_change_none.data - for release in package.releases.all(): - if form["set_min"].data and (not only_change_none or release.min_rel is None): - release.min_rel = form["min_rel"].data.getActual() - if form["set_max"].data and (not only_change_none or release.max_rel is None): - release.max_rel = form["max_rel"].data.getActual() + # for release in package.releases.all(): + # if form["set_min"].data and (not only_change_none or release.min_rel is None): + # release.min_rel = form["min_rel"].data.getActual() + # if form["set_max"].data and (not only_change_none or release.max_rel is None): + # release.max_rel = form["max_rel"].data.getActual() db.session.commit() diff --git a/app/templates/packages/release_edit.html b/app/templates/packages/release_edit.html index 0130e98..ec250c1 100644 --- a/app/templates/packages/release_edit.html +++ b/app/templates/packages/release_edit.html @@ -43,25 +43,6 @@ {% endif %} {% endif %} -

{{ _("Supported Minetest versions") }}

- -
- {{ render_field(form.min_rel, class_="col-sm-6") }} - {{ render_field(form.max_rel, class_="col-sm-6") }} -
- - - -

- {{ _("Set the minimum and maximum Minetest versions supported. - This release will be hidden to clients outside of that range. ") }} -
- {{ _("Leave both as None if in doubt.") }} - - {{ _("You can set this automatically in the .conf of your package.") }} -

{{ render_submit_field(form.submit) }}

diff --git a/app/templates/packages/release_new.html b/app/templates/packages/release_new.html index 898756d..3c6ed72 100644 --- a/app/templates/packages/release_new.html +++ b/app/templates/packages/release_new.html @@ -58,30 +58,6 @@ tips on customising releases.") }}

-

{{ _("3. Supported Minetest versions") }}

- -
- {{ render_field(form.min_rel, class_="col-sm-6") }} - {{ render_field(form.max_rel, class_="col-sm-6") }} -
- - - - -

- - {{ _("The .conf of your package can set this automatically, - which will override your selection.") }} -

- -

- {{ _("Set the minimum and maximum Minetest versions supported. - This release will be hidden to clients outside of that range. ") }} -
- {{ _("Leave both as None if in doubt.") }} -

{{ render_submit_field(form.submit) }}

diff --git a/app/templates/users/profile.html b/app/templates/users/profile.html index 4872aac..05c7117 100644 --- a/app/templates/users/profile.html +++ b/app/templates/users/profile.html @@ -161,13 +161,13 @@

{{ medal.description }}

-
+
{% endfor %}