Fix new release not reseting outdated flag
This commit is contained in:
parent
ac4d5c8c88
commit
56ff354021
|
@ -156,7 +156,7 @@ def download_release(package, id):
|
||||||
@login_required
|
@login_required
|
||||||
@is_package_page
|
@is_package_page
|
||||||
def edit_release(package, id):
|
def edit_release(package, id):
|
||||||
release = PackageRelease.query.get(id)
|
release : PackageRelease = PackageRelease.query.get(id)
|
||||||
if release is None or release.package != package:
|
if release is None or release.package != package:
|
||||||
abort(404)
|
abort(404)
|
||||||
|
|
||||||
|
@ -173,7 +173,6 @@ def edit_release(package, id):
|
||||||
form.approved.data = release.approved
|
form.approved.data = release.approved
|
||||||
|
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
wasApproved = release.approved
|
|
||||||
if canEdit:
|
if canEdit:
|
||||||
release.title = form["title"].data
|
release.title = form["title"].data
|
||||||
release.min_rel = form["min_rel"].data.getActual()
|
release.min_rel = form["min_rel"].data.getActual()
|
||||||
|
@ -185,10 +184,10 @@ def edit_release(package, id):
|
||||||
if release.task_id is not None:
|
if release.task_id is not None:
|
||||||
release.task_id = None
|
release.task_id = None
|
||||||
|
|
||||||
if canApprove:
|
if form.approved.data:
|
||||||
release.approved = form["approved"].data
|
release.approve(current_user)
|
||||||
else:
|
elif canApprove:
|
||||||
release.approved = wasApproved
|
release.approved = False
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return redirect(package.getDetailsURL())
|
return redirect(package.getDetailsURL())
|
||||||
|
|
|
@ -856,6 +856,9 @@ class PackageRelease(db.Model):
|
||||||
if not self.package.checkPerm(user, Permission.APPROVE_RELEASE):
|
if not self.package.checkPerm(user, Permission.APPROVE_RELEASE):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
if self.approved:
|
||||||
|
return True
|
||||||
|
|
||||||
assert self.task_id is None and self.url is not None and self.url != ""
|
assert self.task_id is None and self.url is not None and self.url != ""
|
||||||
|
|
||||||
self.approved = True
|
self.approved = True
|
||||||
|
|
Loading…
Reference in New Issue