Replaced the custom message infrastructure in the nomcom app with django.contrib.messages

rjsparks · rjsparks · commit 85c13d65b4e5 · 2015-12-21T20:46:56.000Z
- Legacy-Id: 10618
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
@@ -140,7 +140,7 @@ def test_private_index_post_accept(self):
         r = self.client.post(self.private_index_url, test_data)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertNotEqual(q('p.alert.alert-success'), [])
+        self.assertTrue(q('.alert-success'))
         self.assertEqual(NomineePosition.objects.filter(state='accepted').count (), 1)
         self.client.logout()
 
@@ -152,7 +152,7 @@ def test_private_index_post_decline(self):
         r = self.client.post(self.private_index_url, test_data)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertNotEqual(q('p.alert.alert-success'), [])
+        self.assertTrue(q('.alert-success'))
         self.assertEqual(NomineePosition.objects.filter(state='declined').count (), 1)
         self.client.logout()
 
@@ -164,7 +164,7 @@ def test_private_index_post_pending(self):
         r = self.client.post(self.private_index_url, test_data)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertNotEqual(q('p.alert.alert-success'), [])
+        self.assertTrue(q('.alert-success'))
         self.assertEqual(NomineePosition.objects.filter(state='pending').count (), 1)
         self.client.logout()
 
@@ -1645,7 +1645,9 @@ def do_common_work(self,url,expected_form):
         response = self.client.get(url)
         self.assertEqual(response.status_code,200)
         q=PyQuery(response.content)
-        self.assertTrue(any(['not yet' in x.text for x in q('.alert-warning')]))
+        text_bits = [x.xpath('./text()') for x in q('.alert-warning')]
+        flat_text_bits = [item for sublist in text_bits for item in sublist]
+        self.assertTrue(any(['not yet' in y for y in flat_text_bits]))
         self.assertEqual(bool(q('form:not(.navbar-form)')),expected_form)
         self.client.logout()
 
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html> {% load ietf_filters staticfiles %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
+{% load bootstrap3 %}
 <html lang="en">
   <head>
     <meta charset="utf-8">
@@ -83,15 +84,7 @@
       </nav>
     {% endwith %}
       <div class="container-fluid">
-        {% if messages %}
-          <div class="row">
-	    <div class="col-lg-12">
-	      {% for message in messages %}
-	        <p class="alert alert-info {% if message.tags %}{{ message.tags }}{% endif %}">{{ message }}</p>
-	      {% endfor %}
-	    </div>
-          </div>
-        {% endif %}
+        {% bootstrap_messages %}
         {% if request.COOKIES.left_menu != "off" and not hide_menu %} {# ugly hack for the more or less unported meeting agenda edit pages #}
           <div class="row">
 	    <div class="col-md-2 visible-md visible-lg leftmenu">
diff --git a/ietf/templates/nomcom/chair_help.html b/ietf/templates/nomcom/chair_help.html
@@ -12,9 +12,6 @@
 {% block nomcom_content %}
   {% origin %}
 
-  {% comment %} Why isn't this part of the base templates? {% endcomment %}
-  {% bootstrap_messages %}
-
   <div class="col-sm-2 col-sm-offset-10 hidden-xs hidden-print bs-docs-sidebar" id="nav-instructions">
     <ul class="nav nav-pills nav-stacked small" data-spy="affix">
       <li><a href="#keys">Keypair</a></li>
diff --git a/ietf/templates/nomcom/edit_members.html b/ietf/templates/nomcom/edit_members.html
@@ -10,8 +10,6 @@
   {% origin %}
   <h2>Edit members</h2>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/nomcom/edit_nomcom.html b/ietf/templates/nomcom/edit_nomcom.html
@@ -14,12 +14,6 @@
   {% origin %}
   <h2>Settings</h2>
 
-  {% if message %}
-    <div class="alert alert-{{ message.0 }}">{{ message.1 }}</div>
-  {% endif %}
-
-  {% bootstrap_messages %}
-
   <form enctype="multipart/form-data" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/nomcom/edit_nominee.html b/ietf/templates/nomcom/edit_nominee.html
@@ -8,14 +8,9 @@
 
 {% block nomcom_content %}
   {% origin %}
-  {% bootstrap_messages %}
 
   <h2>Edit email<br><small>{{ nominee }}</small></h2>
 
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/nomcom/edit_position.html b/ietf/templates/nomcom/edit_position.html
@@ -15,8 +15,6 @@
   {% origin %}
   <h2>{% if position %}Edit{% else %}Add{% endif %} position</h2>
 
-  {% bootstrap_messages %}
-
   <form method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
@@ -26,12 +26,6 @@
    {% endif %}
   </p>
 
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
-
-  {% bootstrap_messages %}
-
   {% if nomcom|has_publickey %}
     <div class="row">
       <div id="nominees" class="col-sm-4 col-sm-push-8">
diff --git a/ietf/templates/nomcom/private_feedback_email.html b/ietf/templates/nomcom/private_feedback_email.html
@@ -8,13 +8,8 @@
 
 {% block nomcom_content %}
   {% origin %}
-  {% if message %}
-    <div class="alert alert-{{ message.0 }}">{{ message.1 }}</div>
-  {% endif %}
 
   {% if form %}
-    {% bootstrap_messages %}
-
     <form id="paste-email-feedback-form" method="post">
       {% csrf_token %}
       {% bootstrap_form form %}
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
@@ -100,9 +100,6 @@ <h2>Nominees by position</h2>
   </table>
 
   {% if is_chair %}
-    {% if message %}
-      <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-    {% endif %}
 
     {% if nomcom.group.state_id == 'active' %}
       <div class="form-group">
diff --git a/ietf/templates/nomcom/private_key.html b/ietf/templates/nomcom/private_key.html
@@ -10,10 +10,6 @@
   {% origin %}
   <h2>Enter private key</h2>
 
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
-
   <p>In order to access the {{ nomcom.group }} data you have to enter your private key. Please paste it in the text area below. The key must be in the following format:</p>
 
   <pre>
diff --git a/ietf/templates/nomcom/private_merge.html b/ietf/templates/nomcom/private_merge.html
@@ -26,12 +26,6 @@ <h2>Merging nominee email addresses</h2>
     primary address is the one which the nominee prefers at the time.
   </p>
 
-  {% if message %}
-    <div class="alert alert-{{ message.0 }}">{{ message.1 }}</div>
-  {% endif %}
-
-  {% bootstrap_messages %}
-
   {% if form %}
     <form id="mergeform" method="post">
       {% csrf_token %}
diff --git a/ietf/templates/nomcom/private_nominate.html b/ietf/templates/nomcom/private_nominate.html
@@ -17,12 +17,6 @@
   {% origin %}
   <h2>Candidate nomination</h2>
 
-  {% bootstrap_messages %}
-
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
-
   {% if form %}
 
     <form id="nominate-form" method="post">
diff --git a/ietf/templates/nomcom/private_questionnaire.html b/ietf/templates/nomcom/private_questionnaire.html
@@ -9,18 +9,12 @@
 
 {% block nomcom_content %}
 
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
-
   {% if form %}
     {% if questionnaire_response %}
       <h2>Questionnaire response</h2>
       {{ questionnaire_response }}
     {% endif %}
 
-    {% bootstrap_messages %}
-
     <form id="questionnnaireform" method="post">
       {% csrf_token %}
       {% bootstrap_form form %}
diff --git a/ietf/templates/nomcom/process_nomination_status.html b/ietf/templates/nomcom/process_nomination_status.html
@@ -8,9 +8,6 @@
 
 {% block nomcom_content %}
   {% origin %}
-  {% if message %}
-    <div class="alert alert-{{ message.0 }}">{{ message.1 }}</div>
-  {% endif %}
 
   {% if need_confirmation %}
     <form method="post">
diff --git a/ietf/templates/nomcom/public_nominate.html b/ietf/templates/nomcom/public_nominate.html
@@ -15,11 +15,6 @@
 
 {% block nomcom_content %}
   {% origin %}
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
-
-  {% bootstrap_messages %}
 
   {% if form %}
     <form id="nominate-form" method="post">
diff --git a/ietf/templates/nomcom/send_reminder_mail.html b/ietf/templates/nomcom/send_reminder_mail.html
@@ -26,12 +26,6 @@ <h2>Send remider to {{reminder_description}}</h2>
     <p>The message that will be sent is shown below the list of nominees. </p>
   {% endif %}
 
-  {% bootstrap_messages %}
-
-  {% if message %}
-    <div class="alert alert-{{ message.0 }}">{{ message.1 }}</div>
-  {% endif %}
-
   {% if nomcom.group.state_id == 'active' %} 
     <form id="reminderform " method="post">
       {% csrf_token %}
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
@@ -15,9 +15,6 @@
   {% origin %}
   <h2>Feedback pending from email list</h2>
 
-  {% if message %}
-    <p class="alert alert-{{ message.0 }}">{{ message.1 }}</p>
-  {% endif %}
 
   {% if formset.forms %}
     <form method="post">
