Remove minetest release version requirements from package uploads
This commit is contained in:
parent
16108d1f39
commit
1d48f5dabe
|
@ -53,10 +53,6 @@ class CreatePackageReleaseForm(FlaskForm):
|
||||||
uploadOpt = RadioField(lazy_gettext("Method"), choices=[("upload", lazy_gettext("File Upload"))], default="upload")
|
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)
|
vcsLabel = StringField(lazy_gettext("Git reference (ie: commit hash, branch, or tag)"), default=None)
|
||||||
fileUpload = FileField(lazy_gettext("File Upload"))
|
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"))
|
submit = SubmitField(lazy_gettext("Save"))
|
||||||
|
|
||||||
|
|
||||||
|
@ -65,10 +61,6 @@ class EditPackageReleaseForm(FlaskForm):
|
||||||
url = StringField(lazy_gettext("URL"), [Optional()])
|
url = StringField(lazy_gettext("URL"), [Optional()])
|
||||||
task_id = StringField(lazy_gettext("Task ID"), filters = [lambda x: x or None])
|
task_id = StringField(lazy_gettext("Task ID"), filters = [lambda x: x or None])
|
||||||
approved = BooleanField(lazy_gettext("Is Approved"))
|
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"))
|
submit = SubmitField(lazy_gettext("Save"))
|
||||||
|
|
||||||
|
|
||||||
|
@ -93,11 +85,9 @@ def create_release(package):
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
try:
|
try:
|
||||||
if form["uploadOpt"].data == "vcs":
|
if form["uploadOpt"].data == "vcs":
|
||||||
rel = do_create_vcs_release(current_user, package, form.title.data,
|
rel = do_create_vcs_release(current_user, package, form.title.data, form.vcsLabel.data)
|
||||||
form.vcsLabel.data, form.min_rel.data.getActual(), form.max_rel.data.getActual())
|
|
||||||
else:
|
else:
|
||||||
rel = do_create_zip_release(current_user, package, form.title.data,
|
rel = do_create_zip_release(current_user, package, form.title.data, form.fileUpload.data)
|
||||||
form.fileUpload.data, form.min_rel.data.getActual(), form.max_rel.data.getActual())
|
|
||||||
return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL()))
|
return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL()))
|
||||||
except LogicError as e:
|
except LogicError as e:
|
||||||
flash(e.message, "danger")
|
flash(e.message, "danger")
|
||||||
|
@ -158,8 +148,6 @@ def edit_release(package, id):
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
if canEdit:
|
if canEdit:
|
||||||
release.title = form["title"].data
|
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):
|
if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL):
|
||||||
release.url = form["url"].data
|
release.url = form["url"].data
|
||||||
|
@ -205,11 +193,11 @@ def bulk_change_release(package):
|
||||||
elif form.validate_on_submit():
|
elif form.validate_on_submit():
|
||||||
only_change_none = form.only_change_none.data
|
only_change_none = form.only_change_none.data
|
||||||
|
|
||||||
for release in package.releases.all():
|
# for release in package.releases.all():
|
||||||
if form["set_min"].data and (not only_change_none or release.min_rel is None):
|
# if form["set_min"].data and (not only_change_none or release.min_rel is None):
|
||||||
release.min_rel = form["min_rel"].data.getActual()
|
# release.min_rel = form["min_rel"].data.getActual()
|
||||||
if form["set_max"].data and (not only_change_none or release.max_rel is None):
|
# if form["set_max"].data and (not only_change_none or release.max_rel is None):
|
||||||
release.max_rel = form["max_rel"].data.getActual()
|
# release.max_rel = form["max_rel"].data.getActual()
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
|
|
|
@ -43,25 +43,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<h3 class="mt-5">{{ _("Supported Minetest versions") }}</h3>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
{{ render_field(form.min_rel, class_="col-sm-6") }}
|
|
||||||
{{ render_field(form.max_rel, class_="col-sm-6") }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p id="minmax_warning" style="color:#f00; display: none;">
|
|
||||||
{{ _("Maximum must be greater than or equal to the minimum!") }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
{{ _("Set the minimum and maximum Minetest versions supported.
|
|
||||||
This release will be hidden to clients outside of that range. ") }}
|
|
||||||
<br />
|
|
||||||
{{ _("Leave both as None if in doubt.") }}
|
|
||||||
|
|
||||||
{{ _("You can <a href='/help/package_config/'>set this automatically</a> in the .conf of your package.") }}
|
|
||||||
</p>
|
|
||||||
<p class="mt-5">
|
<p class="mt-5">
|
||||||
{{ render_submit_field(form.submit) }}
|
{{ render_submit_field(form.submit) }}
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -58,30 +58,6 @@
|
||||||
tips on customising releases.") }}
|
tips on customising releases.") }}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h3 class="mt-5">{{ _("3. Supported Minetest versions") }}</h3>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
{{ render_field(form.min_rel, class_="col-sm-6") }}
|
|
||||||
{{ render_field(form.max_rel, class_="col-sm-6") }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<p id="minmax_warning" style="color:#f00; display: none;">
|
|
||||||
{{ _("Maximum must be greater than or equal to the minimum!") }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<i class="fas fa-exclamation-circle mr-2"></i>
|
|
||||||
{{ _("The .conf of your package can <a href='/help/package_config/'>set this automatically</a>,
|
|
||||||
which will override your selection.") }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
{{ _("Set the minimum and maximum Minetest versions supported.
|
|
||||||
This release will be hidden to clients outside of that range. ") }}
|
|
||||||
<br />
|
|
||||||
{{ _("Leave both as None if in doubt.") }}
|
|
||||||
</p>
|
|
||||||
<p class="mt-5">
|
<p class="mt-5">
|
||||||
{{ render_submit_field(form.submit) }}
|
{{ render_submit_field(form.submit) }}
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -161,13 +161,13 @@
|
||||||
<p>
|
<p>
|
||||||
{{ medal.description }}
|
{{ medal.description }}
|
||||||
</p>
|
</p>
|
||||||
<div class="progress">
|
<!-- <div class="progress">
|
||||||
<div class="progress-bar" role="progressbar"
|
<div class="progress-bar" role="progressbar"
|
||||||
style="width: {{ [100 * medal.progress[0] / medal.progress[1], 100] | min }}%;"
|
style="width: {{ [100 * medal.progress[0] / medal.progress[1], 100] | min }}%;"
|
||||||
aria-valuenow="{{ medal.progress[0] }}" aria-valuemin="0" aria-valuemax="{{ medal.progress[1] }}">
|
aria-valuenow="{{ medal.progress[0] }}" aria-valuemin="0" aria-valuemax="{{ medal.progress[1] }}">
|
||||||
{{ _("%(value)d / %(target)d", value=medal.progress[0], target=medal.progress[1]) }}
|
{{ _("%(value)d / %(target)d", value=medal.progress[0], target=medal.progress[1]) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
Loading…
Reference in New Issue