openinfra
/
odsreg
Code Issues Proposed changes

Rename 'Preapproved' to 'Approved' 

'Preapproved' kind of made sense when scheduling was
happening within the app, but makes no sense at all now.

Change-Id: I5b4c1e123697977246cf48d8b6f112ba717f0621
This commit is contained in:
Thierry Carrez 2017-03-16 14:19:58 +01:00
parent d75aebbdfc
commit 45cce87287
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfp/models.py
View File

@ -51,7 +51,7 @@ class Proposal(models.Model):
STATUSES = (
('U', 'Unreviewed'),
('I', 'Incomplete'),
('A', 'Preapproved'),
('A', 'Approved'),
('R', 'Refused'),
)
proposer = models.ForeignKey(User)

2
cfp/templates/cfpdetails.html
View File

@ -1,7 +1,7 @@
{% extends "regform.html" %}
{% block helppage %}
<p>This screen lets you see the details of a proposed session.</p>
<p>Note that you can only edit sessions that you suggested yourself (or if you're the topic lead). Sessions in <i>Preapproved</i> state cannot be changed.</p>
<p>Note that you can only edit sessions that you suggested yourself (or if you're the topic lead). Sessions in <i>Approved</i> state cannot be changed.</p>
{% endblock %}
{% block formtitle %}
<h2>{{ proposal.title }}</h2>

2
cfp/templates/cfpreview.html
View File

@ -4,7 +4,7 @@
<p>Here you can change the status of the session and add a few comments. The following statuses are available:</p>
<p><i>Unreviewed</i>: you haven't had time to look into this one yet</p>
<p><i>Incomplete</i>: you would like to see changes made to this description before making a decision. Add details on the Reviewer's notes textfield: those will be sent to the proposer.</p>
<p><i>Preapproved</i>: proposed session looks good, you'll schedule it. You may still merge it with another session at scheduling time though. Title and description for preapproved sessions are frozen.</p>
<p><i>Approved</i>: proposed session looks good, you'll schedule it. You may still merge it with another session at scheduling time though. Title and description for approved sessions are frozen.</p>
<p><i>Rejected</i>: session is not appropriate, off-topic, or not a community open discussion.</p>
{% endblock %}
{% block formtitle %}

4
cfp/templates/topiclist.html
View File

@ -2,9 +2,9 @@
{% block helppage %}
<p>This is the topic lead review screen. It lists all session suggestions for your topic so far.</p>
{% if sched %}
<p>A graph shows you how many sessions you have proposed, preapproved and scheduled against the number of available slots you have for your topic.</p>
<p>A graph shows you how many sessions you have proposed, approved and scheduled against the number of available slots you have for your topic.</p>
{% endif %}
<p>You can see the details of a proposed session (or edit sessions that are not in <i>Preapproved</i> state yet) by clicking on its title. You can sort the results by clicking on the corresponding table headers.</p>
<p>You can see the details of a proposed session (or edit sessions that are not in <i>Approved</i> state yet) by clicking on its title. You can sort the results by clicking on the corresponding table headers.</p>
<p>To change the status for a given session, click on the <i>Status</i> you want to change.</p>
{% if sched %}
<p>Finally, when you're ready to do the scheduling of your topic, you can click on the <i>Scheduling</i> button.</p>