From 7fb28f40e65ea691b28a2c4f9b5e4939788ff90a Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Fri, 24 May 2013 17:02:56 +0200
Subject: [PATCH] Use same link for view/edit proposals

URLs for viewing and editing proposals were different, which caused
confusion when people posted links to their proposals.

Additionally fix a few places where "Scheduled" status was not migrated
from proposal.status = 'S' to proposal.scheduled = True.
---
 cfp/templates/cfpdetails.html |  8 +++++++-
 cfp/templates/cfpedit.html    |  2 +-
 cfp/templates/cfplist.html    |  7 +------
 cfp/templates/topiclist.html  |  4 ----
 cfp/urls.py                   |  1 -
 cfp/views.py                  | 19 +++++++------------
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/cfp/templates/cfpdetails.html b/cfp/templates/cfpdetails.html
index 7a894dc..a1c00c7 100644
--- a/cfp/templates/cfpdetails.html
+++ b/cfp/templates/cfpdetails.html
@@ -18,6 +18,12 @@ in topic <b>{{ proposal.topic }}</b></p>
 </ul>
 {% endif %}
 <h4>Status</h4>
-<p>This proposal is in <b>{{ proposal.get_status_display }}</b> state.</p>
+<p>This proposal is in <b>
+{% if proposal.scheduled %}
+Scheduled
+{% else %}
+{{ proposal.get_status_display }}
+{% endif %}
+</b> state.</p>
 <a class=roundedButton href="/{{ request.session.lastlist }}">Back</A>
 {% endblock %}
diff --git a/cfp/templates/cfpedit.html b/cfp/templates/cfpedit.html
index 7989e01..8541b6c 100644
--- a/cfp/templates/cfpedit.html
+++ b/cfp/templates/cfpedit.html
@@ -9,7 +9,7 @@
 <h4>Reviewer notes:</h4>
 <p>{{ proposal.reviewer_notes }}</p>
 {% endif %}
-<form action="/cfp/edit/{{ proposal.id }}" method="post">
+<form action="/cfp/details/{{ proposal.id }}" method="post">
 {% endblock %}
 {% block formfooter %}
 <input id="toggleButton" class="roundedButton" type="submit" value="Modify" />
diff --git a/cfp/templates/cfplist.html b/cfp/templates/cfplist.html
index e3cdb1c..89162ed 100644
--- a/cfp/templates/cfplist.html
+++ b/cfp/templates/cfplist.html
@@ -31,12 +31,7 @@
 <tr>
 <td>{{ proposal.topic.name }}</td>
 <td>
-{% if proposal.proposer == user and proposal.status != 'A' %}
-    <a href="/cfp/edit/{{ proposal.id }}">
-{% else %}
-    <a href="/cfp/details/{{ proposal.id }}">
-{% endif %}
-{{ proposal.title }}</a>
+    <a href="/cfp/details/{{ proposal.id }}">{{ proposal.title }}</a>
 </td>
 <td>{{ proposal.proposer.first_name }} {{ proposal.proposer.last_name }}</td>
 <td class="right"><span class="sortkey">{{ proposal.status }}</span>
diff --git a/cfp/templates/topiclist.html b/cfp/templates/topiclist.html
index aee7468..dcfd506 100644
--- a/cfp/templates/topiclist.html
+++ b/cfp/templates/topiclist.html
@@ -39,11 +39,7 @@
 {% endif %}
 </td>
 <td>
-{% if proposal.scheduled %}
 <a href="/cfp/details/{{ proposal.id }}">{{ proposal.title }}</a>
-{% else %}
-<a href="/cfp/edit/{{ proposal.id }}">{{ proposal.title }}</a>
-{% endif %}
 </td>
 <td>{{ proposal.proposer.first_name }} {{ proposal.proposer.last_name }}</td>
 <td class="right"><span class="sortkey">{{ proposal.status }}</span>
diff --git a/cfp/urls.py b/cfp/urls.py
index 2ac3bc4..3f0d4ba 100644
--- a/cfp/urls.py
+++ b/cfp/urls.py
@@ -19,7 +19,6 @@ from django.conf.urls.defaults import *
 urlpatterns = patterns('odsreg.cfp.views',
     (r'^details/(\d+)$', 'details'),
     (r'^create$', 'create'),
-    (r'^edit/(\d+)$', 'edit'),
     (r'^review/(\d+)$', 'review'),
     (r'^switch/(\d+)$', 'switch'),
     (r'^delete/(\d+)$', 'delete'),
diff --git a/cfp/views.py b/cfp/views.py
index f294450..a91e97d 100644
--- a/cfp/views.py
+++ b/cfp/views.py
@@ -72,14 +72,6 @@ def topicstatus(request):
     return render(request, "topicstatus.html", {'topics': topics})
 
 
-@login_required
-def details(request, proposalid):
-    proposal = Proposal.objects.get(id=proposalid)
-    return render(request, "cfpdetails.html",
-                  {'proposal': proposal,
-                   'blueprints': linkify(proposal.blueprints)})
-
-
 @login_required
 def create(request):
     if request.method == 'POST':
@@ -98,11 +90,14 @@ def create(request):
 
 
 @login_required
-def edit(request, proposalid):
+def details(request, proposalid):
     proposal = Proposal.objects.get(id=proposalid)
-    if (((proposal.proposer != request.user) or proposal.status in ['A', 'S'])
-        and not topiclead(request.user, proposal.topic)):
-        return forbidden()
+    if (proposal.scheduled or
+        (((proposal.proposer != request.user) or proposal.status == 'A')
+          and not topiclead(request.user, proposal.topic))):
+        return render(request, "cfpdetails.html",
+                      {'proposal': proposal,
+                       'blueprints': linkify(proposal.blueprints)})
     if request.method == 'POST':
         form = ProposalEditForm(request.POST, instance=proposal)
         if form.is_valid():