Changeset 0d29a2 in indico

Timestamp:

02/04/10 18:43:18 (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:

8f6f66, f3d0f4

Parents:

9161a3

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/04/10 18:41:32)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/04/10 18:43:18)

Message:

[FIX] Issue with material registries

• Certain datatypes don't contain all the material types that Contribution contains;
• Material registries should be a target of refactoring in the future;.

Location:

indico/MaKaC

Files:

• conference.py (modified) (5 diffs)
• webinterface/materialFactories.py (modified) (4 diffs)
• webinterface/rh/conferenceBase.py (modified) (1 diff)

indico/MaKaC/conference.py

@@ -401 +401 @@
         recMat.recover()
         self.notifyModification()
+
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import CategoryMFRegistry
+        return CategoryMFRegistry
 
     def getMaterialById( self, matId ):
@@ -4045 +4052 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import ConfMFRegistry
+        return ConfMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'paper':
@@ -6485 +6499 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import SessionMFRegistry
+        return SessionMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'minutes':
@@ -9216 +9237 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import ContribMFRegistry
+        return ContribMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'paper':
@@ -10483 +10511 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import SubContributionMFRegistry
+        return SubContributionMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'paper':

indico/MaKaC/webinterface/materialFactories.py

@@ -20 +20 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
+import MaKaC.conference as conference
 import MaKaC.webinterface.urlHandlers as urlHandlers
 import MaKaC.webinterface.wcomponents as wcomponents
-import MaKaC.conference as conference
 from MaKaC.common.Configuration import Config
 from MaKaC.i18n import _
@@ -399 +399 @@
         for factory in cls._registry.values():
             if factory.appliesToMaterial(mat):
-                return factory            
+                return factory
 
 
@@ -409 +409 @@
                   VideoFactory._id: VideoFactory, \
                   PosterFactory._id: PosterFactory }
-
 
 class SessionMFRegistry( MaterialFactoryRegistry ):
@@ -422 +421 @@
                   PosterFactory._id: PosterFactory }
 
-
+class CategoryMFRegistry( ContribMFRegistry ):
+    pass
+
+class SubContributionMFRegistry( ContribMFRegistry ):
+    pass

indico/MaKaC/webinterface/rh/conferenceBase.py

@@ -282 +282 @@
         """
         
-        mf = materialFactories.ContribMFRegistry.getById(self._materialId)
+        mf = self._target.getMaterialRegistry().getById(self._materialId)
 
         material = mf.get(self._target)