diff options
| -rw-r--r-- | app/models.py | 13 | ||||
| -rw-r--r-- | app/templates/packages/view.html | 2 | ||||
| -rw-r--r-- | app/views/packages.py | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/app/models.py b/app/models.py index eac8d8f..cafdf5d 100644 --- a/app/models.py +++ b/app/models.py @@ -215,6 +215,8 @@ class PackagePropertyKey(enum.Enum): type = "Type" license = "License" tags = "Tags" + harddeps = "Hard Dependencies" + softdeps = "Soft Dependencies" repo = "Repository" website = "Website" issueTracker = "Issue Tracker" @@ -287,6 +289,17 @@ class Package(db.Model): requests = db.relationship("EditRequest", backref="package", lazy="dynamic") + def __init__(self, package=None): + if package is None: + return + + self.author_id = package.author_id + self.created_at = package.created_at + self.approved = package.approved + + for e in PackagePropertyKey: + setattr(self, e.name, getattr(package, e.name)) + def getAsDictionary(self, base_url): return { "name": self.name, diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 59a1501..c3dbb34 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -86,7 +86,7 @@ <li><a href="{{ package.getNewScreenshotURL() }}">Add screenshot</a></li> {% endif %} {% if current_user.is_authenticated %} - <!-- <li><a href="{{ package.getCreateEditRequestURL() }}">Suggest Change</a></li> --> + <li><a href="{{ package.getCreateEditRequestURL() }}">Suggest Changes</a></li> {% endif %} {% if package.checkPerm(current_user, "MAKE_RELEASE") %} <li><a href="{{ package.getCreateReleaseURL() }}">Create Release</a></li> diff --git a/app/views/packages.py b/app/views/packages.py index 460864c..308b3b4 100644 --- a/app/views/packages.py +++ b/app/views/packages.py @@ -266,10 +266,6 @@ def create_edit_editrequest_page(package, id=None): if erequest.package != package: abort(404) - from copy import copy - edited_package = copy(package) - erequest.applyAll(edited_package) - if not erequest.checkPerm(current_user, Permission.EDIT_EDITREQUEST): abort(403) @@ -277,6 +273,9 @@ def create_edit_editrequest_page(package, id=None): flash("Can't edit EditRequest, it has already been merged or rejected", "error") return redirect(erequest.getURL()) + edited_package = Package(package) + erequest.applyAll(edited_package) + form = EditRequestForm(request.form, obj=edited_package) if request.method == "POST" and form.validate(): |