diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py index 3d282f5..04f0ca3 100644 --- a/app/blueprints/packages/packages.py +++ b/app/blueprints/packages/packages.py @@ -505,34 +505,6 @@ def remove_self_maintainers(package): return redirect(package.getDetailsURL()) -@bp.route("/packages///import-meta/", methods=["POST"]) -@login_required -@is_package_page -def update_from_release(package): - if not package.checkPerm(current_user, Permission.REIMPORT_META): - flash("You don't have permission to reimport meta", "danger") - return redirect(package.getDetailsURL()) - - release = package.releases.first() - if not release: - flash("Release needed", "danger") - return redirect(package.getDetailsURL()) - - msg = "Updated meta from latest release" - addNotification(package.maintainers, current_user, NotificationType.PACKAGE_EDIT, - msg, package.getDetailsURL(), package) - severity = AuditSeverity.NORMAL if current_user in package.maintainers else AuditSeverity.EDITOR - addAuditLog(severity, current_user, msg, package.getDetailsURL(), package) - - db.session.commit() - - task_id = uuid() - zippath = release.url.replace("/uploads/", app.config["UPLOAD_DIR"]) - checkZipRelease.apply_async((release.id, zippath), task_id=task_id) - - return redirect(url_for("tasks.check", id=task_id, r=package.getEditURL())) - - @bp.route("/packages///audit/") @login_required @is_package_page diff --git a/app/models/packages.py b/app/models/packages.py index fe439a7..ffa2ec1 100644 --- a/app/models/packages.py +++ b/app/models/packages.py @@ -535,10 +535,6 @@ class Package(db.Model): return url_for("packages.remove_self_maintainers", author=self.author.username, name=self.name) - def getUpdateFromReleaseURL(self): - return url_for("packages.update_from_release", - author=self.author.username, name=self.name) - def getReviewURL(self): return url_for('packages.review', author=self.author.username, name=self.name) @@ -607,9 +603,6 @@ class Package(db.Model): elif perm == Permission.CHANGE_RELEASE_URL: return user.rank.atLeast(UserRank.MODERATOR) - elif perm == Permission.REIMPORT_META: - return user.rank.atLeast(UserRank.ADMIN) - else: raise Exception("Permission {} is not related to packages".format(perm.name)) diff --git a/app/models/users.py b/app/models/users.py index 8d868ad..cf017a4 100644 --- a/app/models/users.py +++ b/app/models/users.py @@ -66,7 +66,6 @@ class Permission(enum.Enum): MAKE_RELEASE = "MAKE_RELEASE" DELETE_RELEASE = "DELETE_RELEASE" ADD_SCREENSHOTS = "ADD_SCREENSHOTS" - REIMPORT_META = "REIMPORT_META" APPROVE_SCREENSHOT = "APPROVE_SCREENSHOT" APPROVE_RELEASE = "APPROVE_RELEASE" APPROVE_NEW = "APPROVE_NEW" diff --git a/app/templates/packages/create_edit.html b/app/templates/packages/create_edit.html index c67af90..da7facb 100644 --- a/app/templates/packages/create_edit.html +++ b/app/templates/packages/create_edit.html @@ -50,17 +50,6 @@ {% endif %} - {% if package and package.checkPerm(current_user, "REIMPORT_META") and package.releases.first() %} -
- - - - {{ _("Reimport meta from latest release.") }} - {{ _("This will override 'provides', 'dependencies', and 'optional_dependencies'.") }} -
-
- {% endif %} -