Changeset 605179 in indico

Timestamp:

02/24/11 13:54:32 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

4ff1b2

Parents:

3632eb

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (02/04/11 12:09:02)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/24/11 13:54:32)

Message:

[MIN] Support plugin option subtypes

• for internal use e.g. in the pluginoptionlist template
• to configure a certain option

Location:

indico/MaKaC

Files:

• plugins/base.py (modified) (6 diffs)
• services/implementation/plugins.py (modified) (7 diffs)

indico/MaKaC/plugins/base.py

@@ -168 +168 @@
         return {"description": description,
                 "type": optionType,
+                "subType": attributes.get("subType", None),
                 "defaultValue": attributes.get("defaultValue", None),
                 "editable": attributes.get("editable", True),
@@ -239 +240 @@
         self.__options[name] = PluginOption(name, attributes["description"], attributes["type"],
                                             attributes["defaultValue"], attributes["editable"], attributes["visible"],
-                                            attributes["mustReload"], True, order)
+                                            attributes["mustReload"], True, order, attributes["subType"])
         self._notifyModification()
 
@@ -252 +253 @@
         option.setDescription(attributes["description"])
         option.setType(attributes["type"])
+        option.setSubType(attributes["subType"])
         option.setEditable(attributes["editable"])
         option.setVisible(attributes["visible"])
@@ -697 +699 @@
     }
 
-    def __init__(self, name, description, valueType, value=None, editable=True, visible=True, mustReload=False, present=True, order=0):
+    def __init__(self, name, description, valueType, value=None, editable=True, visible=True, mustReload=False, present=True, order=0, subType=None):
         self.__name = name
         self.__description = description
         self.__type = valueType
+        self.__subType = subType
         self.__present = present
         self.__editable = editable
@@ -721 +724 @@
         return self.__type
 
+    def getSubType(self):
+        return self.__subType
+
     def getValue(self):
         return self.__value
@@ -760 +766 @@
     def setType(self, valueType):
         self.__type = valueType
+
+    def setSubType(self, subType):
+        self.__subType = subType
 
     def setValue(self, value):

indico/MaKaC/services/implementation/plugins.py

@@ -25 +25 @@
 
 class PluginOptionsBase (AdminService):
-    
+
     def _checkParams(self):
         optionName = self._params.get('optionName', None)
@@ -49 +49 @@
                 raise ServiceError('ERR-PLUG1', 'optionName argument does not have the proper pluginType.plugin.option format')
         else:
-            raise ServiceError('ERR-PLUG0', 'optionName argument not present') 
-            
+            raise ServiceError('ERR-PLUG0', 'optionName argument not present')
+
 
 class PluginOptionsAddUsers ( PluginOptionsBase, UserListModificationBase):
-    
+
     def _checkParams(self):
         PluginOptionsBase._checkParams(self)
         UserListModificationBase._checkParams(self)
-        
+
     def _getAnswer(self):
         if self._targetOption.getType() == 'users' or self._targetOption.getType() == 'usersGroups':
@@ -68 +68 @@
         else:
             raise ServiceError('ERR-PLUG2', "option %s.%s.%s is not of type 'users'" % (self._pluginType, self._plugin, self._targetOption))
-        
+
         return True
 
@@ -76 +76 @@
         PluginOptionsBase._checkParams(self)
         UserModificationBase._checkParams(self)
-        
+
     def _getAnswer(self):
         if self._targetOption.getType() == 'users' or self._targetOption.getType() == 'usersGroups':
@@ -83 +83 @@
         else:
             raise ServiceError('ERR-PLUG2', "option %s.%s.%s is not of type 'users'" % (self._pluginType, self._plugin, self._targetOption))
-        
+
         return True
 
 class PluginOptionsAddRooms ( PluginOptionsBase ):
-    
+
     def _checkParams(self):
         PluginOptionsBase._checkParams(self)
-        
+
     def _getAnswer(self):
         if self._targetOption.getType() == 'rooms':
@@ -100 +100 @@
         else:
             raise ServiceError('ERR-PLUG2', "option %s.%s.%s is not of type 'rooms'" % (self._pluginType, self._plugin, self._targetOption))
-        
+
         return True
 
@@ -107 +107 @@
     def _checkParams(self):
         PluginOptionsBase._checkParams(self)
-        
+
     def _getAnswer(self):
         if self._targetOption.getType() == 'rooms':