From 2470ad77dd8ddb605e36fd369505b836c97448b3 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sat, 3 Nov 2012 18:29:07 +0000 Subject: [PATCH] Made it more obvious when an intended status or shepherding AD is not set Removed an unused template Show reset approval text immediately. Fixes bug #900 - Legacy-Id: 5000 --- ietf/idrfc/views_ballot.py | 66 +------------- ietf/templates/idrfc/ballot_writeups.html | 90 ------------------- ietf/templates/idrfc/doc_tab_document.html | 2 +- ietf/templates/idrfc/doc_tab_document_id.html | 4 +- 4 files changed, 6 insertions(+), 156 deletions(-) delete mode 100644 ietf/templates/idrfc/ballot_writeups.html diff --git a/ietf/idrfc/views_ballot.py b/ietf/idrfc/views_ballot.py index 2137217a4..66b51ef67 100644 --- a/ietf/idrfc/views_ballot.py +++ b/ietf/idrfc/views_ballot.py @@ -519,14 +519,6 @@ class BallotWriteupForm(forms.ModelForm): def clean_ballot_writeup(self): return self.cleaned_data["ballot_writeup"].replace("\r", "") -class ApprovalTextForm(forms.ModelForm): - class Meta: - model = BallotInfo - fields = ["approval_text"] - - def clean_approval_text(self): - return self.cleaned_data["approval_text"].replace("\r", "") - @group_required('Area_Director','Secretariat') def lastcalltext(request, name): """Editing of the last call text""" @@ -848,64 +840,15 @@ if settings.USE_DB_REDESIGN_PROXY_CLASSES: ballot_writeupnotes = ballot_writeupnotesREDESIGN -@group_required('Area_Director','Secretariat') -def ballot_approvaltext(request, name): - """Editing of approval text""" - doc = get_object_or_404(InternetDraft, filename=name) - if not doc.idinternal: - raise Http404() - login = IESGLogin.objects.get(login_name=request.user.username) - - try: - ballot = doc.idinternal.ballot - except BallotInfo.DoesNotExist: - ballot = generate_ballot(request, doc) - - approval_text_form = ApprovalTextForm(instance=ballot) - - if request.method == 'POST': - - if "save_approval_text" in request.POST: - approval_text_form = ApprovalTextForm(request.POST, instance=ballot) - if approval_text_form.is_valid(): - ballot.approval_text = approval_text_form.cleaned_data["approval_text"] - add_document_comment(request, doc, "Approval announcement text changed") - ballot.save() - - if "regenerate_approval_text" in request.POST: - ballot.approval_text = generate_approval_mail(request, doc) - add_document_comment(request, doc, "Approval announcement text regenerated") - ballot.save() - - # make sure form has the updated text - approval_text_form = ApprovalTextForm(instance=ballot) - - doc.idinternal.event_date = date.today() - doc.idinternal.save() - - can_announce = doc.idinternal.cur_state_id > 19 - docs_with_invalid_status = [d.document().file_tag() for d in doc.idinternal.ballot_set() if "None" in d.document().intended_status.intended_status or "Request" in d.document().intended_status.intended_status] - need_intended_status = ", ".join(docs_with_invalid_status) - - return render_to_response('idrfc/ballot_approvaltext.html', - dict(doc=doc, - back_url=doc.idinternal.get_absolute_url(), - ballot=ballot, - approval_text_form=approval_text_form, - can_announce=can_announce, - need_intended_status=need_intended_status, - ), - context_instance=RequestContext(request)) - -class ApprovalTextFormREDESIGN(forms.Form): +class ApprovalTextForm(forms.Form): approval_text = forms.CharField(widget=forms.Textarea, required=True) def clean_approval_text(self): return self.cleaned_data["approval_text"].replace("\r", "") @group_required('Area_Director','Secretariat') -def ballot_approvaltextREDESIGN(request, name): +def ballot_approvaltext(request, name): """Editing of approval text""" doc = get_object_or_404(Document, docalias__name=name) if not doc.get_state("draft-iesg"): @@ -936,7 +879,7 @@ def ballot_approvaltextREDESIGN(request, name): e = generate_approval_mail(request, doc) # make sure form has the updated text - form = ApprovalTextForm(initial=dict(approval_text=existing.text)) + form = ApprovalTextForm(initial=dict(approval_text=e.text)) can_announce = doc.get_state("draft-iesg").order > 19 need_intended_status = "" @@ -952,9 +895,6 @@ def ballot_approvaltextREDESIGN(request, name): ), context_instance=RequestContext(request)) -if settings.USE_DB_REDESIGN_PROXY_CLASSES: - ApprovalTextForm = ApprovalTextFormREDESIGN - ballot_approvaltext = ballot_approvaltextREDESIGN @group_required('Secretariat') def approve_ballot(request, name): diff --git a/ietf/templates/idrfc/ballot_writeups.html b/ietf/templates/idrfc/ballot_writeups.html deleted file mode 100644 index 1b41eaa4d..000000000 --- a/ietf/templates/idrfc/ballot_writeups.html +++ /dev/null @@ -1,90 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Ballot writeups for {{ doc }}{% endblock %} - -{% block morecss %} -form #id_last_call_text { - width: 700px; - height: 300px; -} -form #id_ballot_writeup { - width: 700px; - height: 300px; -} -form #id_approval_text { - width: 700px; - height: 300px; -} -{% endblock %} - -{% block content %} -

Ballot writeups for {{ doc }}

- -
-

Last Call Announcement Text

- - {{ last_call_form.last_call_text }} - -

{{ last_call_form.last_call_text.errors }}

- - {% if can_request_last_call and need_intended_status %} -

You need to select intended status of {{ need_intended_status }} and regenerate last call text to request last call.

- {% endif %} - -
- Back - - - {% if can_request_last_call and not need_intended_status %} - - {% endif %} -
-
- - -
-

Ballot Writeup and Notes

- -

(Technical Summary, Working Group Summary, Document Quality, - Personnel, RFC Editor Note, IRTF Note, IESG Note, IANA Note)

- -

This text will be appended to all announcements and messages to - the IRTF or RFC Editor.

- - {{ ballot_writeup_form.ballot_writeup }} - -
- Back - - -
-
- - -
-

Ballot Approval Announcement Text

- -

Sent after approval.

- - {{ approval_text_form.approval_text }} - -
- Back - - -
-
- -{% load ietf_filters %} -{% if user|in_group:"Secretariat" %} -

-{% if can_make_last_call %} -Make Last Call -{% endif %} - -{% if can_announce %} -Approve ballot -{% endif %} -

-{% endif %} -{% endblock%} diff --git a/ietf/templates/idrfc/doc_tab_document.html b/ietf/templates/idrfc/doc_tab_document.html index 62256bb3a..e4f91e1bd 100644 --- a/ietf/templates/idrfc/doc_tab_document.html +++ b/ietf/templates/idrfc/doc_tab_document.html @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {% else %} {% if stream_info.stream.name == 'ISE' or stream_info.stream.name == 'IRTF' %} {% if user|in_group:"Secretariat" and not info.conflict_reviews %} -{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}Begin IETF Conflict Review{% endif %} +{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}Begin IETF Conflict Review {% if not doc.underlying_document.intended_std_level %}(note that intended status is not set){% endif %}{% endif %} {% endif %} {% else %} {% if stream_info.stream.name == 'IETF'%}{%if not doc.in_ietf_process %} diff --git a/ietf/templates/idrfc/doc_tab_document_id.html b/ietf/templates/idrfc/doc_tab_document_id.html index 90a621879..ef8e4107a 100644 --- a/ietf/templates/idrfc/doc_tab_document_id.html +++ b/ietf/templates/idrfc/doc_tab_document_id.html @@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Intended RFC status: {% with user|in_group:"Area_Director,Secretariat" as add_link %} {% if add_link %}{% endif %} -{{ doc.underlying_document.intended_std_level|default:"-" }} +{{ doc.underlying_document.intended_std_level|default:"(None)" }} {% if add_link %}{% endif %} {% endwith %} @@ -142,7 +142,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Responsible AD: {% with user|in_group:"Area_Director,Secretariat" as add_link %} {% if add_link %}{% endif %} -{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"-"|escape }}{%else%}-{%endif%} +{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"(None)"|escape }}{%else%}(None){%endif%} {% if add_link %}{% endif %} {% endwith %}