Changeset db1132 in indico

Timestamp:

04/23/12 14:46:28 (14 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

72cc08e

Parents:

128e2e

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/19/12 13:56:08)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/23/12 14:46:28)

Message:

[IMP] Simplified code in layout listing

• Also deleted unnecessary code;

File:

• indico/MaKaC/webinterface/wcomponents.py (modified) (1 diff)

indico/MaKaC/webinterface/wcomponents.py

@@ -460 +460 @@
         vars["MaKaCHomeURL"] = urlHandlers.UHCategoryDisplay.getURL(self._conf.getOwnerList()[0])
 
-        #moved here from WHeader in order to be able to use DisplayTZ with self._conf (in some pages WHeader has no self._conf).
-        #TODO: Is this needed?
-        #vars["Timezones"] = Config.getInstance().getTimezoneList()
-
-
-#        if self._conf.getModifKey() != '':
-#            url = urlHandlers.UHConfEnterModifKey.getURL(self._conf)
-#            url.addParam("redirectURL",urlHandlers.UHConferenceDisplay.getURL(self._conf))
-#            vars["confModif"] = """<a href=%s><img src=%s valign="middle"></a>"""%(quoteattr(str(url)), quoteattr(str(Configuration.Config.getInstance().getSystemIconURL( "modify" ))))
-#        else:
-#            vars["confModif"] = ""
-
         # Default values to avoid NameError while executing the template
         styleMgr = info.HelperMaKaCInfo.getMaKaCInfoInstance().getStyleManager()
         styles = styleMgr.getExistingStylesForEventType("conference")
 
-        vars["viewoptions"] = []
-        viewoptions = []
-        if len(styles) != 0:
-            styles.sort(key=styleMgr.getStyleName)
-            for styleId in styles:
-                viewoptions.append({"id": styleId, "name": styleMgr.getStyleName(styleId) })
-        vars["viewoptions"] = viewoptions
+        vars["viewoptions"] = list({"id": sid, "name": styleMgr.getStyleName(sid)} \
+                                       for sid in sorted(styles, key=styleMgr.getStyleName))
         vars["SelectedStyle"] = ""
         vars["pdfURL"] = ""