Merge lp:~mhall119/summit/fixes-661430 into lp:summit

[Michael Hall]

[Dave Walker (davewalker)]

review: Approve

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2010-10-13 18:32:06 +0000
+++ summit/schedule/render.py	2010-10-16 16:41:20 +0000
@@ -288,9 +288,15 @@
                         heading += '<a href="%s">' % escape(room.icecast_url)
                     if room.track:
                         heading += '%s<br/>' % escape(room.track)
-                        heading += '<span class="roomname">%s</span>' % escape(room.title)
+                        if self.edit:
+                            heading += '<span class="roomname">%s (%s)</span>' % (escape(room.title), room.size)
+                        else:
+                            heading += '<span class="roomname">%s</span>' % escape(room.title)
                     else:
-                        heading += escape(room.title)
+                        if self.edit:
+                            heading += '%s (%s)' % (escape(room.title), room.size)
+                        else:
+                            heading += escape(room.title)
                     if room.icecast_url:
                         heading += '</a>'
                 elif self.room or self.track:
@@ -299,7 +305,10 @@
                     if room.track:
                         heading = '%s, %s<br/>' % (escape(room.track),
                                                     date.strftime("%a"))
-                        heading += '<span class="roomname">%s</span>' % escape(room.title)
+                        if self.edit:
+                            heading += '<span class="roomname">%s (%s)</span>' % (escape(room.title), room.size)
+                        else:
+                            heading += '<span class="roomname">%s</span>' % escape(room.title)
                     else:
                         heading = '%s, %s' % (escape(room.title),
                                               date.strftime("%a"))
@@ -450,8 +459,8 @@
                     had_lunch = True
 
                 # Avoid duplicating markers
-                if slot.start  not in markers:
-                    markers.append(slot.start)
+                if slot.start.strftime("%H:%M")  not in markers:
+                    markers.append(slot.start.strftime("%H:%M"))
 
                     style = {
                         'top': '%dpx' % top,
@@ -468,8 +477,8 @@
                 height = 12
 
                 # Avoid duplicating markers
-                if slot.end  not in markers:
-                    markers.append(slot.end )
+                if slot.end.strftime("%H:%M")  not in markers:
+                    markers.append(slot.end.strftime("%H:%M") )
 
                     style = {
                         'top': '%dpx' % top,
@@ -537,9 +546,9 @@
                 and self.track \
                 and self.edit:
             room_name = escape(room.title)
-            if room.size:
-                room_name += ': %d people' % room.size
-            html += '  <span class="roomsize">(%s)</span>\n' % room_name
+            if room.size and self.edit:
+                room_name += ' (%d)' % room.size
+            html += '  <span class="roomsize">%s</span>\n' % room_name
         html += '</div>\n'
 
         return mark_safe(html)
@@ -665,7 +674,7 @@
                 room = meeting.agenda_set.exclude(room__type__exact="closed").get().room
                 room_name = room.title
                 if room.size and self.edit:
-                    room_name += ': %d people' % room.size
+                    room_name += ' (%d)' % room.size
                 html += '  <span class="room">%s</span>\n' % room_name
             except ObjectDoesNotExist:
                 pass

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2010-10-16 16:41:20 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2010-10-16 16:41:20 +0000
@@ -23,7 +23,7 @@
 By room:
 <ul>
     {% for room in summit.public_rooms %}
-        {% if schedule.edit %}
+        {% if edit %}
             {% if room.track %}
                 <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.track.title }} - {{ room.title }}</a> ({{ room.size }})</li>
             {% else %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2010-10-12 21:48:32 +0000
+++ summit/schedule/views.py	2010-10-16 16:41:20 +0000
@@ -53,9 +53,17 @@
 
 @summit_required
 def summit(request, summit, attendee):
+    edit = False
+    if (summit.state != 'public'
+        and 'readonly' not in request.GET) \
+            or 'edit' in request.GET:
+        if request.user.is_authenticated() \
+                and request.user.has_perm('schedule.change_agenda'):
+            edit = True
     context = {
         'summit': summit,
         'attendee': attendee,
+        'edit': edit,
     }
     return render_to_response("schedule/summit.html", context,
                               context_instance=RequestContext(request))