Create single tpl to manage reviewing questions

indico · Dec 8, 2017 · f36707a · f36707a
1 parent 742df90
commit f36707a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 123 deletions.
diff --git a/indico/modules/events/abstracts/controllers/management.py b/indico/modules/events/abstracts/controllers/management.py
@@ -161,9 +161,11 @@ def _process(self):
 
 class RHManageAbstractReviewingQuestions(RHManageAbstractsBase):
     def _process(self):
-        return jsonify_template('events/abstracts/management/abstract_reviewing_questions.html', event=self.event,
+        actions = {'create': 'abstracts.create_reviewing_question', 'edit': 'abstracts.edit_reviewing_question',
+                   'delete': 'abstracts.delete_reviewing_question', 'sort': 'abstracts.sort_reviewing_questions'}
+        return jsonify_template('events/reviewing_questions_management.html', event=self.event,
                                 reviewing_questions=self.event.abstract_review_questions,
-                                field_types=get_reviewing_field_types('abstracts'))
+                                field_types=get_reviewing_field_types('abstracts'), actions=actions, args={})
 
 
 class RHCreateAbstractReviewingQuestion(RHManageAbstractsBase):

diff --git a/indico/modules/events/papers/controllers/management.py b/indico/modules/events/papers/controllers/management.py
@@ -223,9 +223,13 @@ def _process(self):
             questions = self.event.cfp.layout_review_questions
         else:
             questions = self.event.cfp.content_review_questions
-        return jsonify_template('events/papers/management/paper_reviewing_questions.html', event=self.event,
-                                review_type=review_type, questions=questions,
-                                field_types=get_reviewing_field_types('papers'))
+
+        actions = {'create': 'papers.create_reviewing_question', 'edit': 'papers.edit_reviewing_question',
+                   'delete': 'papers.delete_reviewing_question', 'sort': 'papers.sort_reviewing_questions'}
+        args = {'create': {'review_type': review_type}, 'sort': {'review_type': review_type}}
+        return jsonify_template('events/reviewing_questions_management.html', event=self.event,
+                                reviewing_questions=questions, actions=actions,
+                                field_types=get_reviewing_field_types('papers'), args=args)
 
 
 class RHReviewingQuestionsActionsBase(RHManagePapersBase):

diff --git a/indico/modules/events/papers/models/review_questions.py b/indico/modules/events/papers/models/review_questions.py
@@ -39,7 +39,7 @@ class PaperReviewQuestion(ReviewQuestionMixin, db.Model):
 
     @locator_property
     def locator(self):
-        return dict(self.event.locator, question_id=self.id)
+        return dict(self.event.locator, question_id=self.id, review_type=self.type.name)
 
     @property
     def field(self):

diff --git a/indico/modules/events/papers/templates/management/paper_reviewing_questions.html b/indico/modules/events/papers/templates/management/paper_reviewing_questions.html
diff --git a/...agement/abstract_reviewing_questions.html → ...lates/reviewing_questions_management.html b/...agement/abstract_reviewing_questions.html → ...lates/reviewing_questions_management.html
@@ -7,46 +7,48 @@
             {%- trans %}Add new question{% endtrans -%}
         </a>
         <ul class="dropdown">
-            {% for name, field_type in field_types.iteritems() %}
+            {% for name, field_type in field_types.iteritems() -%}
                 <li>
                     <a class="js-action-button"
-                       data-href="{{ url_for('.create_reviewing_question', event, field_type=name) }}"
+                       data-href="{{ url_for(actions.create, event, field_type=name, **(args.create|default({}))) }}"
                        data-title="{% trans %}Add custom reviewing question{% endtrans %}"
                        data-ajax-dialog>
                         {% trans name=field_type.friendly_name %}
                             {{ name }}
                         {% endtrans %}
                     </a>
                 </li>
-            {% endfor %}
+            {%- endfor %}
         </ul>
     </div>
 
-    {% if reviewing_questions %}
+    {% if reviewing_questions -%}
         {% call(reviewing_question) sortable_list(reviewing_questions, id="reviewing-questions-list", classes='tiles disable-if-locked') %}
             <a class="icon-edit js-action-button hide-if-locked"
                data-title="{% trans %}Edit custom field{% endtrans %}"
-               data-href="{{ url_for('.edit_reviewing_question', reviewing_question) }}"
+               data-href="{{ url_for(actions.edit, reviewing_question) }}"
                data-title="{% trans %}Edit the reviewing question{% endtrans %}"
                data-ajax-dialog>
             </a>
             <a class="js-delete-reviewing-question icon-remove hide-if-locked"
                data-method="DELETE"
                data-title="{% trans %}Confirm deletion{% endtrans %}"
-               data-href="{{ url_for('.delete_reviewing_question', reviewing_question) }}"
+               data-href="{{ url_for(actions.delete, reviewing_question) }}"
                data-title="{% trans %}Confirm deletion{% endtrans %}"
                data-confirm="{% trans %}Are you sure you want to delete the reviewing question?{% endtrans %}"
                data-ajax-dialog>
             </a>
         {% endcall %}
-    {% else %}
+    {%- else -%}
         {%- call message_box('info') %}
-            {%- trans %}There are no custom abstract reviewing questions yet.{% endtrans %}
+            {%- trans %}There are no reviewing questions yet.{% endtrans %}
         {%- endcall %}
-    {% endif %}
+    {%- endif %}
 
     <div class="toolbar space-before f-j-end">
-        <button class="i-button big" data-button-back>{% trans %}Close{% endtrans %}</button>
+        <button class="i-button big" data-button-back>
+            {%- trans %}Close{% endtrans -%}
+        </button>
     </div>
 </div>
 
@@ -88,7 +90,7 @@
 
             ids = $.makeArray(ids);
             $.ajax({
-                url: {{ url_for('.sort_reviewing_questions', event)|tojson }},
+                url: {{ url_for(actions.sort, event, **(args.sort|default({})))|tojson }},
                 method: 'POST',
                 data: {
                     field_ids: ids