Merge lp:~summit-hackers/summit/private-rooms into lp:summit

[Chris Johnston]

Adds Private Rooms to the views pages for schedulers and allows them to schedule meetings in those rooms.

Adds Private Rooms to the views pages for schedulers and allows them to schedule meetings in those rooms.

[lp:~summit-hackers/summit/private-rooms]

151. By Chris Johnston on 2011-09-02

Adds private rooms to edit page

152. By Chris Johnston on 2011-09-02

Adds ability for schedulers to schedule private rooms.

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2011-07-19 01:30:45 +0000
+++ summit/schedule/models/summitmodel.py	2011-09-02 17:52:09 +0000
@@ -159,6 +159,12 @@
         rooms = self.room_set.filter(type__exact='open')
         return sorted(rooms, cmp=by_title)
 
+    def private_rooms(self):
+        """List fo private rooms for this summit."""
+        
+        rooms = self.room_set.filter(type__exact='private')
+        return sorted(rooms)
+
     def update_from_launchpad(self):
         """Update from Launchpad data."""
         url = ("https://launchpad.net/sprints/%s/+temp-meeting-export"

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2011-07-22 01:34:00 +0000
+++ summit/schedule/render.py	2011-09-02 17:52:09 +0000
@@ -87,6 +87,10 @@
             self.room = None
             self.rooms = self.summit.open_rooms()
 
+            if self.request.user.is_authenticated():
+                if self.request.user.is_staff:
+                    self.rooms = self.rooms + self.summit.private_rooms()
+
         if track is not None:
             self.track = track
         else:

=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html	2011-07-20 18:21:35 +0000
+++ summit/schedule/templates/schedule/schedule.html	2011-09-02 17:52:09 +0000
@@ -121,7 +121,10 @@
     </div>
 {% endif %}
 {% if schedule.room %}
-    <h1 class="schedule-head">{{ schedule.room.title }}</h1>
+    <h1 class="schedule-head">{{ schedule.room.title }}
+    {% ifequal schedule.room.type 'private' %}
+     - Private
+    {% endifequal %}</h1>
     <h2>
     {% if schedule.room.track %}
         {{ schedule.room.track.title }}

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2011-04-20 19:27:44 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2011-09-02 17:52:09 +0000
@@ -37,6 +37,20 @@
             {% endif %}
         {% endif %}
     {% endfor %}
+    {% if user.is_authenticated %}
+            {% if user.is_staff %}
+                <br />
+                Private:
+                {% for room in summit.private_rooms %}
+                    {% if edit %}
+                        <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> ({{ room.size }})</li>
+                    {% else %}
+                        <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a></li>
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
+    {% endif %}
+
 </ul>
 </td>
 </tr>