From 4508d6f48634eae3939cc0600824e6a0cf54efce Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 13 May 2018 15:40:37 +0100
Subject: Add ability to edit editrequests

---
 app/templates/packages/editrequest_create.html     | 30 ----------------------
 .../packages/editrequest_create_edit.html          | 30 ++++++++++++++++++++++
 app/templates/packages/editrequest_view.html       |  3 +++
 3 files changed, 33 insertions(+), 30 deletions(-)
 delete mode 100644 app/templates/packages/editrequest_create.html
 create mode 100644 app/templates/packages/editrequest_create_edit.html

(limited to 'app/templates')

diff --git a/app/templates/packages/editrequest_create.html b/app/templates/packages/editrequest_create.html
deleted file mode 100644
index dbeba24..0000000
--- a/app/templates/packages/editrequest_create.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	{{ package.title or "Create Package" }}
-{% endblock %}
-
-{% block content %}
-	{% from "macros/forms.html" import render_field, render_submit_field %}
-	<form method="POST" action="">
-		{{ form.hidden_tag() }}
-
-		{{ render_field(form.name) }}
-		{{ render_field(form.title) }}
-		{{ render_field(form.shortDesc) }}
-		{{ render_field(form.desc) }}
-		{{ render_field(form.type) }}
-		{{ render_field(form.license) }}
-		{{ render_field(form.tags) }}
-		{{ render_field(form.repo) }}
-		{{ render_field(form.website) }}
-		{{ render_field(form.issueTracker) }}
-		{{ render_field(form.forums) }}
-
-		<hr />
-
-		{{ render_field(form.edit_title) }}
-		{{ render_field(form.edit_desc) }}
-		{{ render_submit_field(form.submit) }}
-	</form>
-{% endblock %}
diff --git a/app/templates/packages/editrequest_create_edit.html b/app/templates/packages/editrequest_create_edit.html
new file mode 100644
index 0000000..db3beb2
--- /dev/null
+++ b/app/templates/packages/editrequest_create_edit.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+{% block title %}
+	{{ package.title or "Edit Request" }}
+{% endblock %}
+
+{% block content %}
+	{% from "macros/forms.html" import render_field, render_submit_field %}
+	<form method="POST" action="">
+		{{ form.hidden_tag() }}
+
+		{{ render_field(form.name) }}
+		{{ render_field(form.title) }}
+		{{ render_field(form.shortDesc) }}
+		{{ render_field(form.desc) }}
+		{{ render_field(form.type) }}
+		{{ render_field(form.license) }}
+		{{ render_field(form.tags) }}
+		{{ render_field(form.repo) }}
+		{{ render_field(form.website) }}
+		{{ render_field(form.issueTracker) }}
+		{{ render_field(form.forums) }}
+
+		<hr />
+
+		{{ render_field(form.edit_title) }}
+		{{ render_field(form.edit_desc) }}
+		{{ render_submit_field(form.submit) }}
+	</form>
+{% endblock %}
diff --git a/app/templates/packages/editrequest_view.html b/app/templates/packages/editrequest_view.html
index 22b60ae..ce8f70e 100644
--- a/app/templates/packages/editrequest_view.html
+++ b/app/templates/packages/editrequest_view.html
@@ -7,6 +7,9 @@
 {% block content %}
 	<h1>{{ request.title }} by {{ request.author.display_name }}</h1>
 	<p>
+		{% if request.status != 1 and request.status != 2 and request.checkPerm(current_user, 'EDIT_EDITREQUEST') %}
+			<a href="{{ request.getEditURL() }}">Edit</a> |
+		{% endif %}
 		Package: <a href="{{ package.getDetailsURL() }}">{{ package.title }}</a>
 	</p>
 	<p>
-- 
cgit v1.2.3