Merge lp:~cjohnston/summit/required-fail into lp:summit

[Chris Johnston]

Fixes users not being able to see that they are required.

[Adnane Belmadiaf (daker)]

I think it should be {% if participant.participation == 'REQUIRED' %}

review: Needs Fixing

[lp:~cjohnston/summit/required-fail]

498. By Chris Johnston on 2013-03-04

oops

[Michael Hall (mhall119)]

Looks good, tests pass

review: Approve

=== modified file 'summit/schedule/templates/schedule/by_room.html'
--- summit/schedule/templates/schedule/by_room.html	2013-01-10 21:37:16 +0000
+++ summit/schedule/templates/schedule/by_room.html	2013-03-04 18:57:21 +0000
@@ -54,7 +54,7 @@
     <br /><b>Participants:</b>
     <div>{% for participant in agenda.meeting.participant_set.all %}
         <div>
-            {% if participant.required %}
+            {% if participant.participation == 'REQUIRED' %}
             <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
             {% else %}
             <img class="icon" src="/media/img/attending.png" alt="attending">

=== modified file 'summit/schedule/templates/schedule/by_track.html'
--- summit/schedule/templates/schedule/by_track.html	2013-01-10 21:37:16 +0000
+++ summit/schedule/templates/schedule/by_track.html	2013-03-04 18:57:21 +0000
@@ -49,7 +49,7 @@
     <br /><b>Participants:</b>
     <div>{% for participant in agenda.meeting.participant_set.all %}
         <div>
-            {% if participant.required %}
+            {% if participant.participation == 'REQUIRED' %}
             <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
             {% else %}
             <img class="icon" src="/media/img/attending.png" alt="attending">

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2013-01-18 22:24:11 +0000
+++ summit/schedule/templates/schedule/daily.html	2013-03-04 18:57:21 +0000
@@ -62,7 +62,7 @@
     <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;" class="main-agenda-item-name">
         {{agenda.meeting.title}}
     </a>
-    
+
     {% if agenda.meeting.tracks.count > 0 %}
         <span class="main-agenda-item-tracks">({% for track in agenda.meeting.tracks.all %}
             {% ifnotequal forloop.counter 1 %}, {% endifnotequal %}{{ track.title }}
@@ -76,7 +76,7 @@
     <br /><b>Participants:</b>
     <div>{% for participant in agenda.meeting.participant_set.all %}
         <div>
-            {% if participant.required %}
+            {% if participant.participation == 'REQUIRED' %}
             <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
             {% else %}
             <img class="icon" src="/media/img/attending.png" alt="attending">
@@ -101,7 +101,7 @@
     {% if agenda.meeting.spec_url %}<a href="{{ agenda.meeting.spec_url }}"><img class="icon" src="{{ MEDIA_URL }}img/gem-sm.png" title="Go to Blueprint" alt="Go to Blueprint" /></a>{% endif %}
 </td>
 </tr>
-{% endfor %} 
+{% endfor %}
 {% endif %}
 </tbody>
 </table>
@@ -164,11 +164,11 @@
         width: 25%;
         text-align: center;
     }
-    
+
     div.schedule-head .qrcode {
         display: none;
     }
-    
+
     #sub-nav-container {
         margin-bottom: 0px;
     }

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2012-10-27 23:03:05 +0000
+++ summit/schedule/templates/schedule/meeting.html	2013-03-04 18:57:21 +0000
@@ -118,7 +118,7 @@
     <div id="Attendees" class="span-5">
         <h3>Attendees</h3>
         {% for attendee in attendees %}
-            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee.participation = 'REQUIRED' %}<strong>{% endif %}{{ attendee.name }}{% if attendee.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
+            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee in required_attendees %}<strong>{% endif %}{{ attendee.name }}{% if attendee in required_attendees %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
         {% endfor %}
     </div>
         {% endifnotequal %}

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-03-01 21:59:27 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-03-04 18:57:21 +0000
@@ -140,7 +140,7 @@
     <div id="Attendees" class="span-4">
         <h3>Attendees</h3>
         {% for attendee in attendees %}
-            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee.participation = 'REQUIRED' %}<strong>{% endif %}{{ attendee.name }}{% if attendee.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
+            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee in required_attendees %}<strong>{% endif %}{{ attendee.name }}{% if rttendee in equired_attendees %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
         {% endfor %}
     </div>
         {% endifnotequal %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-02-27 18:00:02 +0000
+++ summit/schedule/views.py	2013-03-04 18:57:21 +0000
@@ -462,6 +462,7 @@
     agendaitems = meeting.agenda_set.all()
     participants = meeting.participant_set.all()
     attendees = meeting.attendees
+    required_attendees = meeting.required_attendees
     tracks = meeting.tracks.all()
     user_is_attending = attendee is not None and attendee in meeting.attendees
     user_is_participating = attendee is not None and attendee in [p.attendee for p in participants if not p.from_launchpad]
@@ -481,6 +482,7 @@
         'agenda_items': agendaitems,
         'participants': participants,
         'attendees': attendees,
+        'required_attendees': required_attendees,
         'user_is_attending': user_is_attending,
         'user_is_participating': user_is_participating,
         'required': required,