Changeset 64729b in indico for indico/MaKaC/webinterface/wcomponents.py

Timestamp:

03/17/10 20:31:23 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

7dd15f, f3d0f4

Parents:

382574

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/05/10 17:24:34)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/17/10 20:31:23)

Message:

[IMP] Better material creation Widget

• Clearer, nicer - file uploads and links in one single tab;
• Slight refactor on the server side, regarding material factories and the file upload code;
• Some bug fixes since last improvements;
• There shouldn't be such a promiscuity between material names and ids, but fixing it would require major changes in the DB. To be addressed later;
• Some changes to the TabWidgets? that required some refactoring, and changes in the timetable - fixed some other dialogs as well;
• fixes #247

File:

• indico/MaKaC/webinterface/wcomponents.py (modified) (2 diffs)

indico/MaKaC/webinterface/wcomponents.py

@@ -42 +42 @@
 from MaKaC.common import Config
 from MaKaC.webinterface.common.person_titles import TitlesRegistry
-from MaKaC.conference import Conference
+from MaKaC.conference import Conference, Category
 
 from MaKaC.webinterface.common.timezones import TimezoneRegistry, DisplayTimezoneRegistry
@@ -5541 +5541 @@
         self._target=target
 
+        from MaKaC.webinterface.rh.conferenceBase import RHSubmitMaterialBase
+        if isinstance(target, Category):
+            self._allowedMats = RHSubmitMaterialBase._allowedMatsCategory
+        else:
+            self._allowedMats = RHSubmitMaterialBase._allowedMatsEvent[self._target.getConference().getType()]
+
+    # TODO: Put this out of here, and unify with outputGenerator._generateMaterialList
+    # (when we have a better class hierarchy)
+    def _generateMaterialList(self):
+        """
+        Generates a list containing all the materials, with the
+        corresponding Ids for those that already exist
+        """
+
+        matDict = dict((title.lower(), title) for title in self._allowedMats)
+
+        for material in self._target.getMaterialList():
+            title = material.getTitle().lower()
+            matDict[title] = material.getId()
+
+        return sorted(list((matId, title.title()) for title, matId in matDict.iteritems()))
 
     def getVars(self):
         vars=WTemplated.getVars(self)
+
+        vars["materialList"] = self._generateMaterialList()
 
         vars["materialModifHandler"] = vars.get("materialModifHandler", None)