Changeset 2b572f in indico

Timestamp:

02/13/12 15:30:00 (15 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

75eb7c5, 32ede2

Parents:

b99720

git-author:

Jose Benito <jose.benito.gonzalez@…> (02/13/12 15:28:45)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/13/12 15:30:00)

Message:

[FIX] Adding back the filtering for meetings

File:

• indico/MaKaC/webinterface/pages/conferences.py (modified) (3 diffs)

indico/MaKaC/webinterface/pages/conferences.py

@@ -78 +78 @@
 from indico.modules import ModuleHolder
 from MaKaC.paperReviewing import ConferencePaperReview as CPR
-from MaKaC.conference import Minutes
+from MaKaC.conference import Minutes, Session, Contribution
 from MaKaC.common.Configuration import Config
 from MaKaC.common.utils import formatDateTime
@@ -1043 +1043 @@
 
         timezoneUtil = DisplayTZ(accessWrapper, conf)
-        timezone = timezoneUtil.getDisplayTZ()
-        vars['startDate'] = conf.getAdjustedStartDate(timezone)
-        vars['endDate'] = conf.getAdjustedEndDate(timezone)
-        vars['timezone'] = timezone
+        tz = timezoneUtil.getDisplayTZ()
+        vars['startDate'] = conf.getAdjustedStartDate(tz)
+        vars['endDate'] = conf.getAdjustedEndDate(tz)
+        vars['timezone'] = tz
 
         if conf.getParticipation().displayParticipantList() :
@@ -1087 +1087 @@
         vars['entries'] = []
         confSchedule = conf.getSchedule()
-        entrylist = confSchedule.getEntries()
+        showSession = self._params.get("showSession","")
+        detailLevel = self._params.get("detailLevel", "contribution")
+        showDate = self._params.get("showDate", "all")
+        # Filter by day
+        if showDate == "all":
+            entrylist = confSchedule.getEntries()
+        else:
+            entrylist = confSchedule.getEntriesOnDay(timezone(tz).localize(stringToDate(showDate)))
+        # Check entries filters and access rights
         for entry in entrylist:
+            sessionCand = entry.getOwner().getOwner()
+            # Filter by session
+            if isinstance(sessionCand, Session) and (showSession != "all" and sessionCand.getId() != showSession):
+                continue
+            # Hide/Show contributions
+            if isinstance(entry.getOwner(), Contribution) and detailLevel != "contribution":
+                continue
             if entry.getOwner().canView(accessWrapper):
                 if type(entry) is schedule.BreakTimeSchEntry: