Show only public sheets/assignments to normal users, Issue #47

moschlar · May 18, 2012 · 35e9a3a · 35e9a3a
1 parent 418ae4c
commit 35e9a3a
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 14 deletions.
diff --git a/sauce/model/event.py b/sauce/model/event.py
@@ -59,6 +59,22 @@ def previous_sheets(self):
     def future_sheets(self):
         return [s for s in self.sheets if s.start_time > datetime.now()]
 
+    @property
+    def public_sheets(self):
+        return [s for s in self.sheets if s.public]
+
+    @property
+    def current_public_sheets(self):
+        return [s for s in self.sheets if s.public and s.start_time < datetime.now() and s.end_time > datetime.now()]
+
+    @property
+    def previous_public_sheets(self):
+        return [s for s in self.sheets if s.public and s.end_time < datetime.now()]
+
+    @property
+    def future_public_sheets(self):
+        return [s for s in self.sheets if s.public and s.start_time > datetime.now()]
+
     @property
     def url(self):
         return '/events/%s' % self._url

diff --git a/sauce/templates/details.mak b/sauce/templates/details.mak
@@ -20,25 +20,47 @@
   ${times_dl(event)}
 % endif
 
-% if event.sheets:
-  <h3>Sheets</h3>
-
-  % if event.current_sheets:
-    <h3>Current sheets</h3>
-    ${lists.sheets(event.current_sheets)}
-  % endif
+% if request.teacher:
+  % if event.sheets:
+    <h3>Sheets</h3>
+
+    % if event.current_sheets:
+      <h3>Current sheets</h3>
+      ${lists.sheets(event.current_sheets)}
+    % endif
 
-  % if event.future_sheets:
-    <h3>Future sheets</h3>
-    ${lists.sheets_short(event.future_sheets)}
-  % endif
+    % if event.future_sheets:
+      <h3>Future sheets</h3>
+      ${lists.sheets_short(event.future_sheets)}
+    % endif
 
-  % if event.previous_sheets:
-    <h3>Previous sheets</h3>
-    ${lists.sheets_short(event.previous_sheets)}
+    % if event.previous_sheets:
+      <h3>Previous sheets</h3>
+      ${lists.sheets_short(event.previous_sheets)}
+    % endif
   % endif
 
+% else:
+
+  % if event.public_sheets:
+    <h3>Sheets</h3>
 
+    % if event.current_sheets:
+      <h3>Current sheets</h3>
+      ${lists.sheets(event.current_public_sheets)}
+    % endif
+
+    % if event.future_sheets:
+      <h3>Future sheets</h3>
+      ${lists.sheets_short(event.future_public_sheets)}
+    % endif
+
+    % if event.previous_sheets:
+      <h3>Previous sheets</h3>
+      ${lists.sheets_short(event.previous_public_sheets)}
+    % endif
+  % endif
+
 % endif
 
 % if event.news:

diff --git a/sauce/templates/lists.mak b/sauce/templates/lists.mak
@@ -19,6 +19,11 @@
 
 <%def name="assignments(assignments)">
 
+<%
+if not request.teacher:
+    assignments = [a for a in assignments if a.public]
+%>
+
 <dl>
   %for assignment in assignments:
     <dt>${assignment.link}</dt>