From 5b270dbc4833ef9394d2df3c0fee2a5c65e82a90 Mon Sep 17 00:00:00 2001 From: Robert Lehmann Date: Tue, 18 Mar 2014 10:51:25 +0100 Subject: [PATCH 1/3] Use latest proposal version when submitting reviews. Fixes #95. --- pyconde/reviews/templates/reviews/submit_review_form.html | 4 ++-- pyconde/reviews/views.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyconde/reviews/templates/reviews/submit_review_form.html b/pyconde/reviews/templates/reviews/submit_review_form.html index c9dc5aa..75c0887 100644 --- a/pyconde/reviews/templates/reviews/submit_review_form.html +++ b/pyconde/reviews/templates/reviews/submit_review_form.html @@ -1,8 +1,8 @@ {% extends "reviews/proposal_base.html" %} {% load crispy_forms_tags i18n %} {% block bodyclass %}{{ block.super }} reviewform{% endblock %} -{% block title %}{% blocktrans with title=proposal.title %}Review "{{ title }}"{% endblocktrans %}{% endblock %} -{% block page_title %}{% blocktrans with title=proposal.title %}Review "{{ title }}"{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with title=current_title %}Review "{{ title }}"{% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with title=current_title %}Review "{{ title }}"{% endblocktrans %}{% endblock %} {% block details %}
{% blocktrans %} diff --git a/pyconde/reviews/views.py b/pyconde/reviews/views.py index 89e33ce..cd4ff8d 100644 --- a/pyconde/reviews/views.py +++ b/pyconde/reviews/views.py @@ -187,6 +187,7 @@ def get_context_data(self, **kwargs): 'form': self.form, 'proposal': self.proposal, 'proposal_version': self.proposal_version, + 'current_title': self.proposal_version.title if self.proposal_version else self.proposal.title, } @method_decorator(decorators.reviewer_required) From 65817492e889f8699b576896a3c042c7598d51ff Mon Sep 17 00:00:00 2001 From: Robert Lehmann Date: Tue, 18 Mar 2014 10:53:01 +0100 Subject: [PATCH 2/3] Use latest proposal version in all other review actions too. --- pyconde/reviews/templates/reviews/review_list.html | 4 ++-- pyconde/reviews/templates/reviews/update_proposal.html | 4 ++-- pyconde/reviews/views.py | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pyconde/reviews/templates/reviews/review_list.html b/pyconde/reviews/templates/reviews/review_list.html index dd69a7f..92ef269 100644 --- a/pyconde/reviews/templates/reviews/review_list.html +++ b/pyconde/reviews/templates/reviews/review_list.html @@ -1,8 +1,8 @@ {% extends "reviews/proposal_base.html" %} {% load markup account_tags i18n %} {% block bodyclass %}{{ block.super }} reviewlist{% endblock %} -{% block title %}{% blocktrans with title=proposal.title %}Reviews of "{{ title }}"{% endblocktrans %}{% endblock %} -{% block page_title %}{% blocktrans with title=proposal.title %}Reviews of "{{ title }}"{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with title=current_title %}Reviews of "{{ title }}"{% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with title=current_title %}Reviews of "{{ title }}"{% endblocktrans %}{% endblock %} {% block details %} {% if not object_list %}

{% trans "This proposal has not yet been reviewed." %}

diff --git a/pyconde/reviews/templates/reviews/update_proposal.html b/pyconde/reviews/templates/reviews/update_proposal.html index 55a0cb5..49488f8 100644 --- a/pyconde/reviews/templates/reviews/update_proposal.html +++ b/pyconde/reviews/templates/reviews/update_proposal.html @@ -1,8 +1,8 @@ {% extends "reviews/proposal_base.html" %} {% load crispy_forms_tags i18n %} {% block bodyclass %}{{ block.super }} update-proposal{% endblock %} -{% block title %}{% blocktrans with title=proposal.title %}Editing "{{ title }}" proposal {% endblocktrans %}{% endblock %} -{% block page_title %}{% blocktrans with title=proposal.title %}Editing "{{ title }}" proposal {% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with title=current_title %}Editing "{{ title }}" proposal {% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with title=current_title %}Editing "{{ title }}" proposal {% endblocktrans %}{% endblock %} {% block details %} {% crispy form %} {% endblock details %} diff --git a/pyconde/reviews/views.py b/pyconde/reviews/views.py index cd4ff8d..5f9d0d9 100644 --- a/pyconde/reviews/views.py +++ b/pyconde/reviews/views.py @@ -233,6 +233,7 @@ def get_context_data(self, **kwargs): data = super(UpdateReviewView, self).get_context_data(**kwargs) data['proposal'] = self.object.proposal data['proposal_version'] = models.ProposalVersion.objects.get_latest_for(self.object.proposal) + data['current_title'] = data['proposal_version'].title if data['proposal_version'] else data['proposal'].title return data def get_success_url(self): @@ -516,7 +517,8 @@ def get(self, request, *args, **kwargs): return self.render_to_response({ 'form': self.form, 'proposal': self.object, - 'proposal_version': self.proposal_version + 'proposal_version': self.proposal_version, + 'current_title': self.proposal_version.title if self.proposal_version else self.object.title, }) def post(self, request, *args, **kwargs): @@ -582,6 +584,7 @@ def get_context_data(self, **kwargs): data = super(ProposalReviewsView, self).get_context_data(**kwargs) data['proposal'] = get_object_or_404(models.Proposal, pk=self.kwargs['proposal_pk']) data['proposal_version'] = models.ProposalVersion.objects.get_latest_for(data['proposal']) + data['current_title'] = data['proposal_version'].title if data['proposal_version'] else data['proposal'].title return data def get_queryset(self): From 699007474087ae60fb29b29792b27afe38fbea2b Mon Sep 17 00:00:00 2001 From: Robert Lehmann Date: Tue, 18 Mar 2014 10:53:39 +0100 Subject: [PATCH 3/3] Fix reference to i18n'd template variable. --- pyconde/reviews/templates/reviews/proposal_details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyconde/reviews/templates/reviews/proposal_details.html b/pyconde/reviews/templates/reviews/proposal_details.html index 608f55b..5751ff3 100644 --- a/pyconde/reviews/templates/reviews/proposal_details.html +++ b/pyconde/reviews/templates/reviews/proposal_details.html @@ -1,8 +1,8 @@ {% extends "reviews/proposal_base.html" %} {% load markup crispy_forms_tags i18n account_tags %} {% block bodyclass %}{{ block.super }} proposaldetails{% endblock %} -{% block page_title %}{% blocktrans with title=proposal.title %}Review info: {{ current_title }}{% endblocktrans %}{% endblock %} -{% block title %}{% blocktrans with title=proposal.title %}Review info: {{ current_title }}{% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with title=current_title %}Review info: {{ title }}{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with title=current_title %}Review info: {{ title }}{% endblocktrans %}{% endblock %} {% block details %}
{% if proposal.kind.slug == 'training' %}