Merge lp:~cjohnston/summit/private into lp:summit

[Chris Johnston]

Adds private room as an option for a room status.

[Michael Hall (mhall119)]

Doesn't fully resolve the bug, but it's the first step in the process. More work will be needed to determine how to properly allow viewing and scheduling.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-04-20 14:26:23 +0000
+++ .bzrignore	2011-07-17 18:32:48 +0000
@@ -4,3 +4,9 @@
 summit/summit.db
 summit/ubuntu_website
 summit/linaro_website
+summit/docs
+summit/south
+summit/.hgignore
+summit/.hg_archival.txt
+summit/.hgtags
+summit/setup.py
 
=== modified file 'summit/schedule/models/roommodel.py'
--- summit/schedule/models/roommodel.py	2010-03-05 10:33:36 +0000
+++ summit/schedule/models/roommodel.py	2011-07-17 18:32:48 +0000
@@ -33,6 +33,7 @@
         (u'open', u'Openly scheduled'),
         (u'plenary', u'Plenary events'),
         (u'closed', u'Closed'),
+        (u'private', u'Private'),
     )
 
     summit = models.ForeignKey(Summit)
 
=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2011-06-12 02:00:30 +0000
+++ summit/schedule/models/summitmodel.py	2011-07-17 18:32:48 +0000
@@ -28,6 +28,7 @@
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
+from django.db.models.query_utils import Q
 
 from django.contrib.auth.models import User
 
@@ -138,7 +139,7 @@
             else:
                 return cmp(a.track.title, b.track.title)
 
-        rooms = self.room_set.exclude(type__exact='closed')
+        rooms = self.room_set.exclude(Q(type__exact='closed') | Q(type__exact='private'))
         return sorted(rooms, cmp=by_title)
 
     def open_rooms(self):