Changeset af424d9 in indico

Timestamp:

01/12/12 15:34:54 (17 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

9201f2

Parents:

38f650

git-author:

Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (07/12/11 17:06:21)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/12/12 15:34:54)

Message:

[IMP] Manage conveners in sessions

• Replaced search users page by popup.
• Implemented JS class to manage the list of conveners in sessions.
• Implemented AJAX services to add, remove, and edit conveners.
• Added functionality to grant/revoke submissions rights to the conveners.
• Deleted deprecated code

Location:

indico

Files:

• MaKaC/services/implementation/session.py (modified) (3 diffs)
• MaKaC/webinterface/meeting.py (modified) (3 diffs)
• MaKaC/webinterface/pages/conferences.py (modified) (1 diff)
• MaKaC/webinterface/pages/sessions.py (modified) (6 diffs)
• MaKaC/webinterface/rh/conferenceModif.py (modified) (2 diffs)
• MaKaC/webinterface/rh/sessionModif.py (modified) (3 diffs)
• MaKaC/webinterface/tpls/SessionModifMain.tpl (modified) (2 diffs)
• MaKaC/webinterface/urlHandlers.py (modified) (2 diffs)
• MaKaC/webinterface/wcomponents.py (modified) (1 diff)
• htdocs/js/indico/Core/Dialogs/Users.js (modified) (4 diffs)
• htdocs/js/indico/Core/Widgets/UserList.js (modified) (4 diffs)
• htdocs/js/indico/Management/Participants.js (modified) (1 diff)
• htdocs/js/indico/Management/Sessions.js (modified) (2 diffs)
• htdocs/sessionCreation.py (modified) (1 diff)
• htdocs/sessionModification.py (modified) (2 diffs)

indico/MaKaC/services/implementation/session.py

@@ -272 +272 @@
         if self._kindOfUser == "pending":
             if self._kindOfList == "manager":
-                # remove pending email, self._submitterId is an email address
+                # remove pending email, self._chairId is an email address
                 self._session.getAccessController().revokeModificationEmail(self._chairId)
             elif self._kindOfList == "coordinator":
-                chairSession = self._session.getConference().getPendingQueuesMgr().getPendingCoordinators()[self._chairId][0]
-                self._session.getConference().getPendingQueuesMgr().removePendingCoordinator(chairSession)
+                try:
+                    chairSession = self._session.getConference().getPendingQueuesMgr().getPendingCoordinators()[self._chairId][0]
+                    self._session.getConference().getPendingQueuesMgr().removePendingCoordinator(chairSession)
+                except KeyError:
+                    # the user is not in the list of conveners (the table is not updated). Do nothing and update the list
+                    pass
         elif self._kindOfUser == "principal":
             ph = PrincipalHolder()
@@ -323 +327 @@
         coordinatorResult = self._getSessionChairList()
         return [managerResult, coordinatorResult]
+
+
+class SessionConvenersBase(SessionModifBase):
+
+    def _isEmailAlreadyUsed(self, email):
+        for conv in self._session.getConvenerList():
+            if email == conv.getEmail():
+                return True
+        return False
+
+    def _isSessionManager(self, convener):
+        # pendings managers
+        if convener.getEmail() in self._session.getAccessController().getModificationEmail():
+            return True
+        # managers list
+        for manager in self._session.getManagerList():
+            if convener.getEmail() == manager.getEmail():
+                return True
+        return False
+
+    def _isSessionCoordinator(self, convener):
+        # pendings coordinators
+        if convener.getEmail() in self._session.getConference().getPendingQueuesMgr().getPendingCoordinatorsKeys():
+            return True
+        # coordinator list
+        for coord in self._session.getCoordinatorList():
+            if convener.getEmail() == coord.getEmail():
+                return True
+        return False
+
+    def _setConvenerData(self, conv):
+        conv.setTitle(self._userData.get("title", ""))
+        conv.setFirstName(self._userData.get("firstName", ""))
+        conv.setFamilyName(self._userData.get("familyName", ""))
+        conv.setAffiliation(self._userData.get("affiliation", ""))
+        conv.setEmail(self._userData.get("email", ""))
+        conv.setAddress(self._userData.get("address", ""))
+        conv.setPhone(self._userData.get("phone", ""))
+        conv.setFax(self._userData.get("fax", ""))
+
+
+    def _getConvenerList(self):
+        result = []
+        for convener in self._session.getConvenerList():
+            convFossil = fossilize(convener)
+            convFossil["isManager"] = self._isSessionManager(convener)
+            convFossil["isCoordinator"] = self._isSessionCoordinator(convener)
+            result.append(convFossil)
+        return result
+
+
+class SessionGetConvenerList(SessionConvenersBase):
+
+    def _getAnswer(self):
+        return self._getConvenerList()
+
+
+class SessionAddExistingConvener(SessionConvenersBase):
+
+    def _checkParams(self):
+        SessionConvenersBase._checkParams(self)
+        pm = ParameterManager(self._params)
+        self._userList = pm.extract("userList", pType=list, allowEmpty=False)
+        # Check if there is already a user with the same email
+        for user in self._userList:
+            if self._isEmailAlreadyUsed(user["email"]):
+                raise ServiceAccessError(_("The email address (%s) of a user you are trying to add is already used by another convener or the user is already added to the list. Convener(s) not added.") % user["email"])
+
+    def _getAnswer(self):
+        ah = AvatarHolder()
+        for user in self._userList:
+            convener = SessionChair()
+            convener.setDataFromAvatar(ah.getById(user["id"]))
+            self._session.addConvener(convener)
+        return self._getConvenerList()
+
+
+class SessionAddNewConvener(SessionConvenersBase):
+
+    def _checkParams(self):
+        SessionConvenersBase._checkParams(self)
+        pm = ParameterManager(self._params)
+        self._userData = pm.extract("userData", pType=dict, allowEmpty=False)
+        email = self._userData.get("email", "")
+        # check if the email is empty and the user wants to give any rights
+        if (email == "" and (self._userData.get("manager", False) or self._userData.get("coordinator", False))):
+            raise ServiceAccessError(_("It is not possible to grant any rights to a convener with an empty email address. Convener not added."))
+        if (email != "" and self._isEmailAlreadyUsed(email)):
+            raise ServiceAccessError(_("The email address (%s) is already used by another convener or the user is already added to the list. Convener not added.") % email)
+
+    def _getAnswer(self):
+        conv = SessionChair()
+        self._setConvenerData(conv)
+        self._session.addConvener(conv)
+        if (self._userData.get("manager", False)):
+            # Add to pending managers list
+            self._session.grantModification(conv)
+        if (self._userData.get("coordinator", False)):
+            # Add to pending managers list
+            self._session.addCoordinator(conv)
+        return self._getConvenerList()
+
+
+class SessionConvenerActionBase(SessionConvenersBase):
+
+    def _checkParams(self):
+        SessionConvenersBase._checkParams(self)
+        pm = ParameterManager(self._params)
+        self._convener = self._session.getConvenerById(pm.extract("userId", pType=str, allowEmpty=False))
+        if self._convener == None:
+            raise ServiceError("ERR-U0", _("User does not exist."))
+
+
+class SessionGetConvenerData(SessionConvenerActionBase):
+
+    def _getAnswer(self):
+        result = fossilize(self._convener)
+        result["isManager"] = self._isSessionManager(self._convener)
+        result["isCoordinator"] = self._isSessionCoordinator(self._convener)
+        return result
+
+
+class SessionEditConvenerData(SessionConvenerActionBase):
+
+    def _checkParams(self):
+        SessionConvenerActionBase._checkParams(self)
+        pm = ParameterManager(self._params)
+        self._userData = pm.extract("userData", pType=dict, allowEmpty=False)
+        email = self._userData.get("email", "")
+        if (email == "" and (self._userData.get("manager", False) or self._userData.get("coordinator", False))):
+            raise ServiceAccessError(_("It is not possible to grant any rights to a convener with an empty email address. Convener not edited."))
+        if (email != "" and self._isEmailUsedByOther()):
+            raise ServiceAccessError(_("The email address (%s) is already used by another convener. Convener data not edited.") % email)
+
+    def _isEmailUsedByOther(self):
+        for conv in self._session.getConvenerList():
+            if self._userData.get("email") == conv.getEmail() and self._convener.getId() != conv.getId():
+                return True
+        return False
+
+    def _getAnswer(self):
+        prevEmail = self._convener.getEmail()
+        newEmail = self._userData.get("email", "")
+        isSessionCoordinator = self._isSessionCoordinator(self._convener)
+        isSessionManager = self._isSessionManager(self._convener)
+        self._setConvenerData(self._convener)
+        if prevEmail != newEmail:
+            if isSessionCoordinator:
+                # remove the previous email in queue
+                try:
+                    del self._session.getConference().getPendingQueuesMgr().getPendingCoordinators()[prevEmail]
+                    # add the new email to the list
+                    self._session.addCoordinator(self._convener)
+                except KeyError:
+                    self._session.addCoordinator(self._convener)
+            if isSessionManager:
+                self._session.getAccessController().revokeModificationEmail(prevEmail)
+                self._session.grantModification(self._convener)
+        if (self._userData.get("manager", False)):
+            # Add to pending managers list
+            self._session.grantModification(self._convener)
+        if (self._userData.get("coordinator", False)):
+            # Add to pending managers list
+            self._session.addCoordinator(self._convener)
+        return self._getConvenerList()
+
+
+class SessionRemoveConvener(SessionConvenerActionBase):
+
+    def _getAnswer(self):
+        self._session.removeConvener(self._convener)
+        return self._getConvenerList()
+
+
+class SessionModifyConvenerRights(SessionConvenerActionBase):
+
+    def _checkParams(self):
+        SessionConvenerActionBase._checkParams(self)
+        pm = ParameterManager(self._params)
+        self._kindOfRights = pm.extract("kindOfRights", pType=str, allowEmpty=False)
+
+
+class SessionGrantRights(SessionModifyConvenerRights):
+
+    def _getAnswer(self):
+        if self._convener.getEmail() != "":
+            if self._kindOfRights == "management":
+                self._session.grantModification(self._convener)
+            elif self._kindOfRights == "coordination":
+                self._session.addCoordinator(self._convener)
+        else:
+            raise ServiceAccessError(_("It is not possible to grant any rights to a convener with an empty email address. Please, set an email address for this convener."))
+        return self._getConvenerList()
+
+
+class SessionRevokeRights(SessionModifyConvenerRights):
+
+    def _getAnswer(self):
+        av = AvatarHolder().match({"email": self._convener.getEmail()})
+        if self._kindOfRights == "management":
+            if not av:
+                self._session.getAccessController().revokeModificationEmail(self._convener.getEmail())
+            else:
+                self._session.revokeModification(av[0])
+        elif self._kindOfRights == "coordination":
+            if not av:
+                chairSession = self._session.getConference().getPendingQueuesMgr().getPendingCoordinators()[self._convener.getEmail()][0]
+                self._session.getConference().getPendingQueuesMgr().removePendingCoordinator(chairSession)
+            else:
+                self._session.removeCoordinator(av[0])
+        return self._getConvenerList()
+
 
 
@@ -338 +554 @@
     "protection.addExistingCoordinator": SessionAddExistingChair,
     "protection.removeCoordinator": SessionRemoveChair,
-    "protection.getCoordinatorList": SessionGetChairList
+    "protection.getCoordinatorList": SessionGetChairList,
+
+    "conveners.addExistingConvener": SessionAddExistingConvener,
+    "conveners.addNewConvener": SessionAddNewConvener,
+    "conveners.getConvenerData": SessionGetConvenerData,
+    "conveners.editConvenerData": SessionEditConvenerData,
+    "conveners.removeConvener": SessionRemoveConvener,
+    "conveners.getConvenerList": SessionGetConvenerList,
+    "conveners.grantRights": SessionGrantRights,
+    "conveners.revokeRights": SessionRevokeRights
 }

indico/MaKaC/webinterface/meeting.py

@@ -207 +207 @@
     getModSlotRemConfirmation = staticmethod(getModSlotRemConfirmation)
 
-    def getModConvenerNew(self,session):
-        return WPMModConvenerNew(self,session)
-    getModConvenerNew = staticmethod(getModConvenerNew)
-
     def getSessionAddMaterial(self,session,mf):
         return WPMSessionAddMaterial(self,session,mf)
@@ -238 +234 @@
         return WPMSessionModifSchedule(rh,session)
     getSessionModifSchedule = staticmethod(getSessionModifSchedule)
-
-    def getModConvenerEdit(rh, session):
-        return WPMModConvenerEdit(rh, session)
-    getModConvenerEdit = staticmethod (getModConvenerEdit)
 
 #################### Participants #####################################
@@ -821 +813 @@
     def _setupTabCtrl(self):
         self._tabContribs.disable()
-
-
-class WPMModConvenerEdit(sessions.WPModConvenerEdit):
-    def _setupTabCtrl(self):
-        self._tabContribs.disable()
-
-
-class WPMModConvenerNew(sessions.WPModConvenerNew):
-    def _setupTabCtrl(self):
-        self._tabContribs.disable()
-
 
 class WPMModSlotRemConfirmation(sessions.WPModSlotRemConfirmation):

indico/MaKaC/webinterface/pages/conferences.py

@@ -2777 +2777 @@
         return "".join(html)
 
-#---------------------------------------------------------------------------
-
-class WPNewSessionConvenerSelect( WPConferenceModifBase ):
-
-    def _setActiveTab( self ):
-        self._tabContribList.setActive()
-
-    def _getTabContent( self, params ):
-        searchAction = str(self._rh.getCurrentURL())
-        searchExt = params.get("searchExt","")
-        if searchExt != "":
-            searchLocal = False
-        else:
-            searchLocal = True
-        p = wcomponents.WComplexSelection(self._conf,searchAction, forceWithoutExtAuth=searchLocal)
-        return p.getHTML(params)
-
-#---------------------------------------------------------------------------
-
-class WPNewSessionConvenerNew( WPConferenceModifBase ):
-
-    def __init__(self, rh, conf, params):
-        WPConferenceModifBase.__init__(self, rh, conf)
-        self._params = params
-
-
-    def _setActiveTab( self ):
-        self._tabContribList.setActive()
-
-    def _getTabContent( self, params ):
-        p = wcomponents.WNewPerson()
-        if self._params.get("formTitle",None) is None :
-            self._params["formTitle"] = _("Define new convener")
-        if self._params.get("titleValue",None) is None :
-            self._params["titleValue"] = ""
-        if self._params.get("surNameValue",None) is None :
-            self._params["surNameValue"] = ""
-        if self._params.get("nameValue",None) is None :
-            self._params["nameValue"] = ""
-        if self._params.get("emailValue",None) is None :
-            self._params["emailValue"] = ""
-        if self._params.get("addressValue",None) is None :
-            self._params["addressValue"] = ""
-        if self._params.get("affiliationValue",None) is None :
-            self._params["affiliationValue"] = ""
-        if self._params.get("phoneValue",None) is None :
-            self._params["phoneValue"] = ""
-        if self._params.get("faxValue",None) is None :
-            self._params["faxValue"] = ""
-
-        self._params["disabledRole"] = False
-        self._params["roleDescription"] = i18nformat(""" _("Coordinator")<br> _("Manager")""")
-        self._params["roleValue"] = i18nformat(""" <input type="checkbox" name="coordinatorControl"> _("Give coordinator rights to the convener").<br>
-                                        <input type="checkbox" name="managerControl"> _("Give management rights to the convener").""")
-        self._params["disabledNotice"] = True
-        self._params["noticeValue"] = i18nformat("""<i><font color="black"><b>_("Note"): </b></font>_("If this person does not already have
-         an Indico account, he or she will be sent an email asking to create an account. After the account creation the
-         user will automatically be given coordinator/management rights.")</i>""")
-
-        formAction = urlHandlers.UHConfNewSessionPersonAdd.getURL(self._conf)
-        formAction.addParam("orgin","new")
-        formAction.addParam("typeName","convener")
-        self._params["formAction"] = formAction
-
-        return p.getHTML(self._params)
 
 #---------------------------------------------------------------------------

indico/MaKaC/webinterface/pages/sessions.py

@@ -689 +689 @@
         self._mfr = mfRegistry
 
-    def _getConvenersHTML(self):
-        res=[]
-        for conv in self._session.getConvenerList():
-            url=urlHandlers.UHSessionModConvenerEdit.getURL(conv)
-            res.append("""
-                <input type="checkbox" name="selConv" value=%s> <a href=%s>%s</a>
-                """%(quoteattr(str(conv.getId())),\
-                    quoteattr(str(url)), \
-                    self.htmlText(conv.getFullName())))
-        return "<br>".join(res)
-
     def getVars( self ):
         vars = wcomponents.WTemplated.getVars( self )
@@ -705 +694 @@
         vars["removeMaterialsURL"]=urlHandlers.UHSessionRemoveMaterials.getURL()
 
-        newConvenerURL = urlHandlers.UHSessionDataModificationNewConvenerCreate.getURL(self._session)
-        vars["newConvenerURL"] = newConvenerURL
-        searchConvenerURL = urlHandlers.UHSessionDataModificationNewConvenerSearch.getURL(self._session)
-        vars["searchConvenerURL"] = searchConvenerURL
-        vars["remConvenersURL"]=quoteattr(str(urlHandlers.UHSessionModConvenersRem.getURL(self._session)))
         vars["dataModificationURL"]=quoteattr(str(urlHandlers.UHSessionDataModification.getURL(self._session)))
         vars["code"]=self.htmlText(self._session.getCode())
@@ -731 +715 @@
             vars["startDate"]=self.htmlText(self._session.getAdjustedStartDate().strftime("%A %d %B %Y %H:%M"))
             vars["endDate"]=self.htmlText(self._session.getAdjustedEndDate().strftime("%A %d %B %Y %H:%M"))
-        vars["conveners"]=self._getConvenersHTML()
         vars["bgcolor"] = self._session.getColor()
         vars["textcolor"] = self._session.getTextColor()
@@ -747 +730 @@
             vars["Code"]=""
             vars["Rowspan"]=4
+        vars["confId"] = self._session.getConference().getId()
+        vars["sessionId"] = self._session.getId()
         return vars
 
@@ -816 +801 @@
 #---------------------------------------------------------------------------
 
-class WPSessionDataModificationConvenerSelect( WPSessionModifBase):
-
-    #def _setActiveTab( self ):
-    #    self._tabContribList.setActive()
-
-    def _getTabContent( self, params ):
-        searchAction = str(self._rh.getCurrentURL())
-        newButtonAction = params["newButtonAction"]
-        searchExt = params.get("searchExt","")
-        if searchExt != "":
-            searchLocal = False
-        else:
-            searchLocal = True
-        p = wcomponents.WComplexSelection(self._conf,searchAction, addTo = 5, forceWithoutExtAuth=searchLocal)
-        return p.getHTML(params)
-
-#---------------------------------------------------------------------------
-
-class WPSessionDataModificationConvenerNew(WPSessionModifBase):
-
-    #def _setActiveTab( self ):
-    #    self._tabContribList.setActive()
-
-    def _getTabContent( self, params ):
-        p = wcomponents.WNewPerson()
-
-        if params.get("formTitle",None) is None :
-            params["formTitle"] =_("Define new convener")
-        if params.get("titleValue",None) is None :
-            params["titleValue"] = ""
-        if params.get("surNameValue",None) is None :
-            params["surNameValue"] = ""
-        if params.get("nameValue",None) is None :
-            params["nameValue"] = ""
-        if params.get("emailValue",None) is None :
-            params["emailValue"] = ""
-        if params.get("addressValue",None) is None :
-            params["addressValue"] = ""
-        if params.get("affiliationValue",None) is None :
-            params["affiliationValue"] = ""
-        if params.get("phoneValue",None) is None :
-            params["phoneValue"] = ""
-        if params.get("faxValue",None) is None :
-            params["faxValue"] = ""
-
-
-        params["disabledRole"] = False
-        params["roleDescription"] = i18nformat(""" _("Coordinator")<br> _("Manager")""")
-        if params.has_key("submissionControlValue") :
-            params["roleValue"] = i18nformat(""" <input type="checkbox" name="coordinatorControl" checked> _("Give coordinator rights to the convener").<br>
-                                      <input type="checkbox" name="managerControl" checked> _("Give management rights to the convener").""")
-        else:
-            params["roleValue"] = i18nformat(""" <input type="checkbox" name="coordinatorControl"> _("Give coordinator rights to the convener").<br>
-                                      <input type="checkbox" name="managerControl"> _("Give management rights to the convener").""")
-        params["disabledNotice"] = True
-        params["noticeValue"] = i18nformat("""<i><font color="black"><b> _("Note"): </b></font> _("If this person does not already have
-         an Indico account, he or she will be sent an email asking to create an account. After the account creation the
-         user will automatically be given coordinator rights").</i>""")
-
-
-        if params.get("formAction",None) is None :
-            formAction = urlHandlers.UHSessionDataModificationPersonAdd.getURL(self._conf)
-            formAction.addParam("sessionId",self._session.getId())
-            formAction.addParam("orgin","new")
-            formAction.addParam("typeName","convener")
-            params["formAction"] = formAction
-
-        return p.getHTML(params)
-
-#---------------------------------------------------------------------------
-
 class WPModEditDataConfirmation(WPSessionModification):
 
@@ -894 +808 @@
         url=urlHandlers.UHSessionDataModification.getURL(self._session)
         return wc.getHTML(msg,url,params)
-
-
-class WPModConvenerNew(WPSessionModification):
-
-    def _getTabContent(self,params):
-        caption= _("Adding a new convener")
-        wc=wcomponents.WConfModParticipEdit(title=caption)
-        params["postURL"]=urlHandlers.UHSessionModConvenerNew.getURL(self._session)
-        params["addToManagersList"]= i18nformat("""
-                                    <tr>
-                                        <td nowrap class="titleCellTD">
-                                            <span class="titleCellFormat"> _("Specific rights")</span>
-                                        </td>
-                                        <td bgcolor="white" width="100%%" valign="top" class="blacktext">
-                                            <input type="radio" name="specialRights" value="none" checked> _("Do not give specific rights").<br>
-                                            <input type="radio" name="specialRights" value="manager"> _("Give session manager rights to the convener").<br>
-                                            <input type="radio" name="specialRights" value="coordinator"> _("Give session coordinator rights to the convener").<br><br><i><font color="black"><b> _("Note"): </b></font> _("If this person does not already have an Indico account, he or she will be sent an email asking to create an account. After the account creation the user will automatically be given the specific rights").</i>
-                                        </td>
-                                    </tr>
-                                    """)
-        return wc.getHTML( params )
-
-
-
-class WPModConvenerEdit(WPSessionModification):
-
-##    def _getTabContent(self,params):
-##        caption="Edit convener data"
-##        conv=params["convener"]
-##        wc=wcomponents.WConfModParticipEdit(part=conv,title=caption)
-##        params["postURL"]=urlHandlers.UHSessionModConvenerEdit.getURL(conv)
-##        params["addToManagersList"]=""
-##        return wc.getHTML(params)
-
-    def _getTabContent(self,params):
-        p = wcomponents.WNewPerson()
-        conv = params["convener"]
-        params["formTitle"] =  _("Define new convener")
-        params["titleValue"] = conv.getTitle()
-        params["surNameValue"] = conv.getFamilyName()
-        params["nameValue"] = conv.getFirstName()
-        params["emailValue"] = conv.getEmail()
-        params["addressValue"] = conv.getAddress()
-        params["affiliationValue"] = conv.getAffiliation()
-        params["phoneValue"] = conv.getPhone()
-        params["faxValue"] = conv.getFax()
-
-        params["disabledRole"] = False
-        params["roleDescription"] =  i18nformat(""" _("Coordinator")<br> _("Manager")""")
-        session = conv.getSession()
-        av = user.AvatarHolder().match({"email":conv.getEmail()})
-        params["disabledNotice"] = True
-        coordValue =  i18nformat("""<input type="checkbox" name="coordinatorControl"> _("Give coordinator rights to the convener").""")
-        if (av and av[0] in session.getCoordinatorList()) or conv.getEmail() in session.getCoordinatorEmailList():
-            coordValue = _("""The convener is already a coordinator""")
-        else:
-            params["disabledNotice"] = False
-
-        managerValue =  i18nformat("""<input type="checkbox" name="managerControl"> _("Give management rights to the convener").""")
-        if (av and av[0] in session.getManagerList() ) or conv.getEmail() in session.getAccessController().getModificationEmail():
-            managerValue = _("""The convener is already a manager""")
-        else:
-            params["disabledNotice"] = False
-
-        params["roleValue"] = """ %s<br>
-                                  %s"""%(coordValue, managerValue)
-
-        params["noticeValue"] =  i18nformat("""<i><font color="black"><b> _("Note"): </b></font> _("If this person does not already have
-         an Indico account, he or she will be sent an email asking to create an account. After the account creation the
-         user will automatically be given coordinator/manager rights").</i>""")
-
-        formAction = urlHandlers.UHSessionModConvenerEdit.getURL(conv)
-        formAction.addParam("orgin","new")
-        formAction.addParam("typeName","convener")
-        params["formAction"] = formAction
-
-        return p.getHTML(params)
-
 
 

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -960 +960 @@
             else:
                 raise MaKaCError( _("Session title cannot be empty"), _("Session"))
-        elif self._action == "New convener":
-            self._preserveParams(params)
-            self._redirect(urlHandlers.UHConfNewSessionConvenerNew.getURL(self._conf))
-        elif self._action == "Search convener":
-            self._preserveParams(params)
-            self._redirect(urlHandlers.UHConfNewSessionConvenerSearch.getURL(self._conf))
-        elif self._action == "Remove conveners":
-            self._removePersons(params, "convener")
-        elif self._action == "Add as convener":
-            self._preserveParams(params)
-            url = urlHandlers.UHConfNewSessionPersonAdd.getURL(self._conf)
-            url.addParam("orgin","added")
-            url.addParam("typeName","convener")
-            self._redirect(url)
         else :
             p = conferences.WPConfAddSession(self,self._target,self._day)
@@ -1089 +1075 @@
         return "".join(html)
 
-#-------------------------------------------------------------------------------------
-
-class RHNewSessionConvenerSearch( RHConferenceModifBase ):
-    _uh = urlHandlers.UHConfNewSessionConvenerSearch
-
-    def _checkParams( self, params):
-        RHConferenceModifBase._checkParams(self,params)
-
-    def _process( self ):
-        params = self._getRequestParams()
-
-        params["newButtonAction"] = str(urlHandlers.UHConfNewSessionConvenerNew.getURL())
-        addURL = urlHandlers.UHConfNewSessionPersonAdd.getURL()
-        addURL.addParam("orgin","selected")
-        addURL.addParam("typeName","convener")
-        params["addURL"] = addURL
-        p = conferences.WPNewSessionConvenerSelect( self, self._target)
-        return p.display(**params)
-
-#-------------------------------------------------------------------------------------
-
-class RHNewSessionConvenerNew( RHConferenceModifBase ):
-    _uh = urlHandlers.UHConfNewSessionConvenerNew
-
-    def _checkParams( self, params):
-        RHConferenceModifBase._checkParams(self,params)
-
-    def _process( self ):
-        p = conferences.WPNewSessionConvenerNew( self, self._target, {})
-
-        return p.display()
-
-#-------------------------------------------------------------------------------------
-
-class RHNewSessionPersonAdd( RHConferenceModifBase ):
-    _uh = urlHandlers.UHConfNewSessionPersonAdd
-
-    def _checkParams( self, params):
-        RHConferenceModifBase._checkParams(self,params)
-        self._typeName = params.get("typeName",None)
-        if self._typeName  is None :
-            raise MaKaCError( _("Type name of the person to add is not set."))
-
-    def _process( self ):
-        params = self._getRequestParams()
-        self._errorList = []
-
-        definedList = self._getDefinedList(self._typeName)
-        if definedList is None :
-            definedList = []
-
-        if params.get("orgin","") == "new" :
-            if params.get("ok",None) is None :
-                self._redirect(urlHandlers.UHConfAddSession.getURL(self._conf))
-                return
-            else :
-
-                if (params["email"]=="" and params.has_key("submissionControl")) or (not utils.validMail(params["email"]) and params["email"]!=""):
-                    param={}
-                    param["surNameValue"] = str(params["surName"])
-                    param["nameValue"] = str(params["name"])
-                    param["emailValue"] = str(params["email"])
-                    param["titleValue"] = str(params["title"])
-                    param["addressValue"] = str(params["address"])
-                    param["affiliationValue"] = str(params["affiliation"])
-                    param["phoneValue"] = str(params["phone"])
-                    param["faxValue"] = str(params["fax"])
-                    param["msg"] = "INSERT A VALID E-MAIL ADRESS"
-                    if params.has_key("submissionControl"):
-                        param["submissionControlValue"]="checked"
-
-                    p=conferences.WPNewSessionConvenerNew(self, self._conf, param)
-                    return p.display()
-
-                person = SessionChair()
-                person.setFirstName(params["name"])
-                person.setFamilyName(params["surName"])
-                person.setEmail(params["email"])
-                person.setAffiliation(params["affiliation"])
-                person.setAddress(params["address"])
-                person.setPhone(params["phone"])
-                person.setTitle(params["title"])
-                person.setFax(params["fax"])
-                if not self._alreadyDefined(person, definedList) :
-                    definedList.append([person,params.has_key("coordinatorControl"),params.has_key("managerControl")])
-                else :
-                    self._errorList.append( _("%s has been already defined as %s of this session")%(person.getFullName(),self._typeName))
-
-        elif params.get("orgin","") == "selected" :
-            selectedList = self._normaliseListParam(self._getRequestParams().get("selectedPrincipals",[]))
-
-            for s in selectedList :
-                if s[0:8] == "*author*" :
-                    auths = self._conf.getAuthorIndex()
-                    selected = auths.getById(s[9:])[0]
-                else :
-                    ph = user.PrincipalHolder()
-                    selected = ph.getById(s)
-                if isinstance(selected, user.Avatar) :
-                    person = SessionChair()
-                    person.setDataFromAvatar(selected)
-                    if not self._alreadyDefined(person, definedList) :
-                        definedList.append([person,params.has_key("submissionControl")])
-                    else :
-                        self._errorList.append( _("%s has been already defined as %s of this session")%(person.getFullName(),self._typeName))
-
-                elif isinstance(selected, user.Group) :
-                    for member in selected.getMemberList() :
-                        person = SessionChair()
-                        person.setDataFromAvatar(member)
-                        if not self._alreadyDefined(person, definedList) :
-                            definedList.append([person,params.has_key("submissionControl")])
-                        else :
-                            self._errorList.append( _("%s has been already defined as %s of this session"))%(presenter.getFullName(),self._typeName)
-                else :
-                    person = SessionChair()
-                    person.setTitle(selected.getTitle())
-                    person.setFirstName(selected.getFirstName())
-                    person.setFamilyName(selected.getFamilyName())
-                    person.setEmail(selected.getEmail())
-                    person.setAddress(selected.getAddress())
-                    person.setAffiliation(selected.getAffiliation())
-                    person.setPhone(selected.getPhone())
-                    person.setFax(selected.getFax())
-                    if not self._alreadyDefined(person, definedList) :
-                        definedList.append([person,params.has_key("coordinatorControl"),params.has_key("managerControl")])
-                    else :
-                        self._errorList.append( _("%s has been already defined as %s of this session")%(person.getFullName(),self._typeName))
-
-        elif params.get("orgin","") == "added" :
-            preservedParams = self._getPreservedParams()
-            chosen = preservedParams.get("%sChosen"%self._typeName,None)
-            if chosen is None or chosen == "" :
-                self._redirect(urlHandlers.UHConfAddSession.getURL(self._target))
-                return
-            index = chosen.find("-")
-
-            chosenPerson = None
-
-            if index == -1:
-                ah = user.AvatarHolder()
-                chosenPerson = SessionChair()
-                chosenPerson.setDataFromAvatar(ah.getById(chosen))
-            else:
-                objectId = chosen[1:index]
-                chosenId = chosen[index+1:len(chosen)]
-                if chosen[0:1] == "d" :
-                    object = self._conf.getSessionById(objectId)
-                else :
-                    object = self._conf.getContributionById(objectId)
-                if chosen[0:1] == "s" :
-                    chosenPerson = object.getSpeakerById(chosenId)
-                elif chosen[0:1] == "a" :
-                    chosenPerson = object.getAuthorById(chosenId)
-                elif chosen[0:1] == "c" :
-                    chosenPerson = object.getCoAuthorById(chosenId)
-                elif chosen[0:1] == "d" :
-                    chosenPerson = object.getConvenerById(chosenId)
-            if chosenPerson is None :
-                self._redirect(urlHandlers.UHConfModScheduleNewContrib.getURL(self._target))
-                return
-            person = SessionChair()
-            person.setTitle(chosenPerson.getTitle())
-            person.setFirstName(chosenPerson.getFirstName())
-            person.setFamilyName(chosenPerson.getFamilyName())
-            person.setEmail(chosenPerson.getEmail())
-            person.setAddress(chosenPerson.getAddress())
-            person.setAffiliation(chosenPerson.getAffiliation())
-            person.setPhone(chosenPerson.getPhone())
-            person.setFax(chosenPerson.getFax())
-            if not self._alreadyDefined(person, definedList) :
-                definedList.append([person,params.has_key("coordinatorControl"),params.has_key("managerControl")])
-            else :
-                self._errorList.append( _("%s has been already defined as %s of this session")%(person.getFullName(),self._typeName))
-        else :
-            self._redirect(urlHandlers.UHConfModifSchedule.getURL(self._target))
-            return
-        preservedParams = self._getPreservedParams()
-        preservedParams["errorMsg"] = self._errorList
-        self._preserveParams(preservedParams)
-        self._websession.setVar("%sList"%self._typeName,definedList)
-
-        self._redirect(urlHandlers.UHConfAddSession.getURL(self._conf))
-
-
-    def _getDefinedList(self, typeName):
-        definedList = self._websession.getVar("%sList"%typeName)
-        if definedList is None :
-            return []
-        return definedList
-
-    def _alreadyDefined(self, person, definedList):
-        if person is None :
-            return True
-        if definedList is None :
-            return False
-        fullName = person.getFullName()
-        for p in definedList :
-            if p[0].getFullName() == fullName :
-                return True
-        return False
-
-    def _getPreservedParams(self):
-        params = self._websession.getVar("preservedParams")
-        if params is None :
-            return {}
-        return params
-
-    def _preserveParams(self, params):
-        self._websession.setVar("preservedParams",params)
-    def _removePreservedParams(self):
-        self._websession.setVar("preservedParams",None)
 
 #-------------------------------------------------------------------------------------

indico/MaKaC/webinterface/rh/sessionModif.py

@@ -277 +277 @@
                 self._redirect(url)
                 return
-        elif self._action == "New convener" :
-            self._preserveParams(params)
-            url = urlHandlers.UHSessionDataModificationConvenerSearch.getURL(self._conf)
-            url.addParam("sessionId",self._session.getId())
-
-            self._redirect(url)
-        elif self._action == "Remove conveners" :
-            self._removePersons(params, "convener")
-        elif self._action == "Add convener" :
-            self._preserveParams(params)
-            url = urlHandlers.UHSessionDataModificationPersonAdd.getURL(self._conf)
-            url.addParam("sessionId",self._session.getId())
-            url.addParam("orgin","added")
-            url.addParam("typeName","convener")
-            self._redirect(url)
         p=sessions.WPSessionDataModification(self,self._target)
         wf = self.getWebFactory()
@@ -372 +357 @@
 #-------------------------------------------------------------------------------------
 
-class RHSessionDataModificationConvenerSearch( RHSessionModifBase):
-    _uh = urlHandlers.UHSessionDataModificationConvenerSearch
-
-    def _checkParams( self, params):
-        RHSessionModifBase._checkParams(self,params)
-
-    def _process( self ):
-        params = self._getRequestParams()
-
-        params["newButtonAction"] = str(urlHandlers.UHSessionDataModificationConvenerNew.getURL())
-
-        addURL = urlHandlers.UHSessionDataModificationPersonAdd.getURL()
-        addURL.addParam("orgin","selected")
-        addURL.addParam("typeName","convener")
-        params["addURL"] = addURL
-        p = sessions.WPSessionDataModificationConvenerSelect( self, self._target)
-        return p.display(**params)
-
-#-------------------------------------------------------------------------------------
-
-class RHSessionDataModificationConvenerNew( RHSessionModifBase ):
-    _uh = urlHandlers.UHSessionDataModificationConvenerNew
-
-    def _checkParams( self, params):
-        RHSessionModifBase._checkParams(self,params)
-
-    def _process( self ):
-        p = sessions.WPSessionDataModificationConvenerNew( self, self._target)
-        return p.display()
-
-#-------------------------------------------------------------------------------------
-
-class RHSessionDataModificationPersonAdd( RHSessionModifBase ):
-    _uh = urlHandlers.UHSessionDataModificationPersonAdd
-
-    def _checkParams( self, params):
-        RHSessionModifBase._checkParams(self,params)
-        self._typeName = params.get("typeName",None)
-        if self._typeName  is None :
-            raise MaKaCError( _("Type name of the person to add is not set."))
-
-    def _process( self ):
-        params = self._getRequestParams()
-        self._errorList = []
-
-        definedList = self._getDefinedList(self._typeName)
-        if definedList is None :
-            definedList = []
-
-        if params.get("orgin","") == "new" :
-            if params.get("ok",None) is None :
-                url = urlHandlers.UHSessionDataModification.getURL(self._conf)
-                url.addParam("sessionId",self._session.getId())
-                self._redirect(url)
-                return
-            else :
-                person = SessionChair()
-                person.setFirstName(params["name"])
-                person.setFamilyName(params["surName"])
-                person.setEmail(params["email"])
-                person.setAffiliation(params["affiliation"])
-                person.setAddress(params["address"])
-                person.setPhone(params["phone"])
-                person.setTitle(params["title"])
-                person.setFax(params["fax"])
-                if not self._alreadyDefined(person, self._typeName) :
-                    self._session.addConvener(person)
-                    if params.has_key("submissionControl") :
-                        self._session.grantSubmission(person)
-                else :
-                    self._errorList.append("%s has been already defined as %s of this session"%(person.getFullName(),self._typeName))
-
-        elif params.get("orgin","") == "selected" :
-            selectedList = self._normaliseListParam(self._getRequestParams().get("selectedPrincipals",[]))
-
-            for s in selectedList :
-                if s[0:8] == "*author*" :
-                    auths = self._conf.getAuthorIndex()
-                    selected = auths.getById(s)
-                else :
-                    ph = user.PrincipalHolder()
-                    selected = ph.getById(s)
-                if isinstance(selected, user.Avatar) :
-                    person = SessionChair()
-                    person.setDataFromAvatar(selected)
-                    if not self._alreadyDefined(person, self._typeName) :
-                        self._session.addConvener(person)
-                        if params.has_key("submissionControl") :
-                            self._session.grantSubmission(person)
-                    else :
-                        self._errorList.append("%s has been already defined as %s of this session"%(person.getFullName(),self._typeName))
-
-                elif isinstance(selected, user.Group) :
-                    for member in selected.getMemberList() :
-                        person = SessionChair()
-                        person.setDataFromAvatar(member)
-                        if not self._alreadyDefined(person, self._typeName) :
-                            self._session.addConvener(person)
-                            if params.has_key("submissionControl") :
-                                self._session.grantSubmission(person)
-                        else :
-                            self._errorList.append("%s has been already defined as %s of this session"%(presenter.getFullName(),self._typeName))
-                else :
-                    person = SessionChair()
-                    person.setTitle(selected.getTitle())
-                    person.setFirstName(selected.getFirstName())
-                    person.setFamilyName(selected.getFamilyName())
-                    person.setEmail(selected.getEmail())
-                    person.setAddress(selected.getAddress())
-                    person.setAffiliation(selected.getAffiliation())
-                    person.setPhone(selected.getPhone())
-                    person.setFax(selected.getFax())
-                    if not self._alreadyDefined(person, self._typeName) :
-                        self._session.addConvener(person)
-                        if params.has_key("submissionControl") :
-                            self._session.grantSubmission(person)
-                    else :
-                        self._errorList.append("%s has been already defined as %s of this session"%(person.getFullName(),self._typeName))
-
-        elif params.get("orgin","") == "added" :
-            preservedParams = self._getPreservedParams()
-            chosen = preservedParams.get("%sChosen"%self._typeName,None)
-            if chosen is None or chosen == "" :
-                url = urlHandlers.UHSessionDataModification.getURL(self._conf)
-                url.addParam("sessionId",self._session.getId())
-                self._redirect(url)
-                return
-            index = chosen.find("-")
-            objectId = chosen[1:index]
-            chosenId = chosen[index+1:len(chosen)]
-            if chosen[0:1] == "d" :
-                object = self._conf.getSessionById(objectId)
-            else :
-                object = self._conf.getContributionById(objectId)
-            chosenPerson = None
-            if chosen[0:1] == "s" :
-                chosenPerson = object.getSpeakerById(chosenId)
-            elif chosen[0:1] == "a" :
-                chosenPerson = object.getAuthorById(chosenId)
-            elif chosen[0:1] == "c" :
-                chosenPerson = object.getCoAuthorById(chosenId)
-            elif chosen[0:1] == "d" :
-                chosenPerson = object.getConvenerById(chosenId)
-            if chosenPerson is None :
-                self._redirect(urlHandlers.UHConfModScheduleNewContrib.getURL(self._target))
-                return
-            person = SessionChair()
-            person.setTitle(chosenPerson.getTitle())
-            person.setFirstName(chosenPerson.getFirstName())
-            person.setFamilyName(chosenPerson.getFamilyName())
-            person.setEmail(chosenPerson.getEmail())
-            person.setAddress(chosenPerson.getAddress())
-            person.setAffiliation(chosenPerson.getAffiliation())
-            person.setPhone(chosenPerson.getPhone())
-            person.setFax(chosenPerson.getFax())
-            if not self._alreadyDefined(person, self._typeName) :
-                self._session.addConvener(person)
-                if params.has_key("submissionControl") :
-                    self._session.grantSubmission(person)
-            else :
-                self._errorList.append("%s has been already defined as %s of this session"%(person.getFullName(),self._typeName))
-        else :
-            url = urlHandlers.UHSessionDataModification.getURL(self._conf)
-            url.addParam("sessionId",self._session.getId())
-            self._redirect(url)
-            return
-        preservedParams = self._getPreservedParams()
-        preservedParams["errorMsg"] = self._errorList
-        self._preserveParams(preservedParams)
-        self._websession.setVar("%sList"%self._typeName,definedList)
-
-        url = urlHandlers.UHSessionDataModification.getURL(self._conf)
-        url.addParam("sessionId",self._session.getId())
-        self._redirect(url)
-
-
-    def _getDefinedList(self, typeName):
-        definedList = self._websession.getVar("%sList"%typeName)
-        if definedList is None :
-            return []
-        return definedList
-
-    def _alreadyDefined(self, person, typeName):
-        if person is None :
-            return True
-        if typeName is None :
-            return True
-        fullName = person.getFullName()
-        list = None
-        if typeName == "convener" :
-            list = self._session.getConvenerList()
-        for p in list :
-            if p.getFullName() == fullName :
-                return True
-        return False
-
-    def _getPreservedParams(self):
-        params = self._websession.getVar("preservedParams")
-        if params is None :
-            return {}
-        return params
-
-    def _preserveParams(self, params):
-        self._websession.setVar("preservedParams",params)
-    def _removePreservedParams(self):
-        self._websession.setVar("preservedParams",None)
-
-#-------------------------------------------------------------------------------------
-
-class RHSessionDataModificationNewConvenerCreate( RHSessionModifBase ):
-    _uh = urlHandlers.UHSessionDataModificationNewConvenerCreate
-
-    def _checkParams( self, params):
-        RHSessionModifBase._checkParams(self,params)
-
-    def _process( self ):
-
-        params = self._getRequestParams()
-        formAction = urlHandlers.UHSessionDataModificationConvenerAdd.getURL(self._conf)
-        formAction.addParam("sessionId",self._session.getId())
-        formAction.addParam("orgin","new")
-        formAction.addParam("typeName","convener")
-        params["formAction"] = formAction
-        p = sessions.WPSessionDataModificationConvenerNew( self, self._target)
-        return p.display(**params)
-
-#-------------------------------------------------------------------------------------
-
-class RHSessionDataModificationNewConvenerSearch( RHSessionModifBase):
-    _uh = urlHandlers.UHSessionDataModificationNewConvenerSearch
-
-    def _checkParams( self, params):
-        RHSessionModifBase._checkParams(self,params)
-
-    def _process( self ):
-        params = self._getRequestParams()
-
-        params["newButtonAction"] = str(urlHandlers.UHSessionDataModificationNewConvenerCreate.getURL())
-        addURL = urlHandlers.UHSessionDataModificationConvenerAdd.getURL()
-        addURL.addParam("orgin","selected")
-        addURL.addParam("typeName","convener")
-        params["addURL"] = addURL
-        p = sessions.WPSessionDataModificationConvenerSelect( self, self._target)
-        return p.display(**params)
-
-#-------------------------------------------------------------------------------------
-
-class RHSessionDataModificationConvenerAdd( RHSessionModifBase ):
-    _uh = urlHandlers.UHSessionDataModificationConvenerAdd
-
-    def _checkParams( self, params):
-        RHSessionModifBase._checkParams(self,params)
-        self._typeName = params.get("typeName",None)
-        if self._typeName  is None :
-            raise MaKaCError( _("Type name of the person to add is not set."))
-
-    def _process( self ):
-        params = self._getRequestParams()
-        self._errorList = []
-
-        if params.get("orgin","") == "new" :
-            if params.get("ok",None) is None :
-                url = urlHandlers.UHSessionModification.getURL(self._conf)
-                url.addParam("sessionId",self._session.getId())
-                self._redirect(url)
-                return
-            else :
-                person = SessionChair()
-                person.setFirstName(params["name"])
-                person.setFamilyName(params["surName"])
-                person.setEmail(params["email"])
-                person.setAffiliation(params["affiliation"])
-                person.setAddress(params["address"])
-                person.setPhone(params["phone"])
-                person.setTitle(params["title"])
-                person.setFax(params["fax"])
-
-                self._session.addConvener(person)
-                if params.has_key("coordinatorControl") :
-                    self._session.addCoordinator(person)
-                if params.has_key("managerControl") :
-                    self._session.grantModification(person)
-
-        elif params.get("orgin","") == "selected" and not "cancel" in params:
-            selectedList = self._normaliseListParam(self._getRequestParams().get("selectedPrincipals",[]))
-
-            for s in selectedList :
-                if s[0:8] == "*author*" :
-                    auths = self._conf.getAuthorIndex()
-                    selected = auths.getById(s[9:])[0]
-                else :
-                    ph = user.PrincipalHolder()
-                    selected = ph.getById(s)
-                if isinstance(selected, user.Avatar) :
-                    person = SessionChair()
-                    person.setDataFromAvatar(selected)
-                    self._session.addConvener(person)
-                    if params.has_key("coordinatorControl") :
-                        self._session.addCoordinator(person)
-                    if params.has_key("managerControl") :
-                        self._session.grantModification(person)
-
-                elif isinstance(selected, user.Group) :
-                    for member in selected.getMemberList() :
-                        person = SessionChair()
-                        person.setDataFromAvatar(member)
-                        self._session.addConvener(person)
-                        if params.has_key("coordinatorControl") :
-                            self._session.addCoordinator(person)
-                        if params.has_key("managerControl") :
-                            self._session.grantModification(person)
-
-                else :
-                    person = SessionChair()
-                    person.setTitle(selected.getTitle())
-                    person.setFirstName(selected.getFirstName())
-                    person.setFamilyName(selected.getFamilyName())
-                    person.setEmail(selected.getEmail())
-                    person.setAddress(selected.getAddress())
-                    person.setAffiliation(selected.getAffiliation())
-                    person.setPhone(selected.getPhone())
-                    person.setFax(selected.getFax())
-                    self._session.addConvener(person)
-                    if params.has_key("coordinatorControl") :
-                        self._session.addCoordinator(person)
-                    if params.has_key("managerControl") :
-                        self._session.grantModification(person)
-
-        else :
-            url = urlHandlers.UHSessionModification.getURL(self._conf)
-            url.addParam("sessionId",self._session.getId())
-            self._redirect(url)
-            return
-
-        url = urlHandlers.UHSessionModification.getURL(self._conf)
-        url.addParam("sessionId",self._session.getId())
-        self._redirect(url)
-
-
-#-------------------------------------------------------------------------------------
-
 class RHSessionClose( RHSessionModifBase ):
     _uh = urlHandlers.UHSessionClose
@@ -726 +370 @@
         self._target.setClosed(False)
         self._redirect(urlHandlers.UHSessionModification.getURL(self._target))
-
-class RHConvenerNew(RHSessionModifBase):
-    _uh=urlHandlers.UHSessionModConvenerNew
-
-    def _checkParams(self, params):
-        RHSessionModifBase._checkParams(self,params)
-        self._action=""
-        if params.has_key("ok"):
-            self._action = "perform"
-        elif params.has_key("cancel"):
-            self._action = "cancel"
-
-    def _newConvener(self):
-        c=conference.SessionChair()
-        p=self._getRequestParams()
-        c.setTitle(p.get("title",""))
-        c.setFirstName(p.get("name",""))
-        c.setFamilyName(p.get("surName",""))
-        c.setAffiliation(p.get("affiliation",""))
-        c.setEmail(p.get("email",""))
-        c.setAddress(p.get("address",""))
-        c.setPhone(p.get("phone",""))
-        c.setFax(p.get("fax",""))
-        self._target.addConvener(c)
-        return c
-
-    def _process(self):
-        if self._action!="":
-            if self._action=="perform":
-                conv=self._newConvener()
-                sr=self._getRequestParams().get("specialRights","none")
-                if sr in ["manager","coordinator"]:
-                    if self._getRequestParams().get("email","").strip() == "":
-                        raise FormValuesError("If you want to add specific righst to this convener, please enter their email")
-                    if sr == "manager":
-                        self._target.grantModification(conv)
-                    elif sr == "coordinator":
-                        self._target.addCoordinator(conv)
-            url=urlHandlers.UHSessionModification.getURL(self._target)
-            self._redirect(url)
-        else:
-            p=sessions.WPModConvenerNew(self,self._session)
-            wf = self.getWebFactory()
-            if wf != None:
-                p = wf.getModConvenerNew(self,self._session)
-            return p.display(**self._getRequestParams())
-
-
-class RHConvenersRem( RHSessionModifBase ):
-    _uh = urlHandlers.UHSessionModConvenersRem
-
-    def _checkParams( self, params ):
-        RHSessionModifBase._checkParams( self, params )
-        self._conv=[]
-        for id in self._normaliseListParam(params.get("selConv",[])):
-            self._conv.append(self._target.getConvenerById(id))
-
-    def _process( self ):
-        for conv in self._conv:
-            self._session.removeConvener(conv)
-        self._redirect(urlHandlers.UHSessionModification.getURL(self._session))
-
-
-class RHConvenerEdit(RHSessionModifBase):
-
-    def _checkParams(self,params):
-        RHSessionModifBase._checkParams(self, params)
-        self._convId=params["convId"]
-        self._action=""
-        if params.has_key("ok"):
-            self._action = "perform"
-        elif params.has_key("cancel"):
-            self._action = "cancel"
-
-    def _setConvenerData(self):
-        c=self._target.getConvenerById(self._convId)
-        p = self._getRequestParams()
-        c.setTitle(p.get("title",""))
-        c.setFirstName(p.get("name",""))
-        c.setFamilyName(p.get("surName",""))
-        c.setAffiliation(p.get("affiliation",""))
-        c.setAddress(p.get("address",""))
-        c.setPhone(p.get("phone",""))
-        c.setFax(p.get("fax",""))
-
-        c.setEmail(p.get("email",""))
-
-        if p.get("coordinatorControl", None):
-            self._target.addCoordinator(c)
-        if p.get("managerControl", None):
-            self._target.grantModification(c)
-
-##        grant=0
-##        if c.getEmail().lower().strip() != p.get("email","").lower().strip():
-##            #----If it's already in the pending queue in order to grant
-##            #    modification/coordination rights we must unindex and after the modification of the email,
-##            #    index again...
-##            if self._target.getConference().getPendingQueuesMgr().isPendingManager(c):
-##                self._target.getConference().getPendingQueuesMgr().removePendingManager(c)
-##                grant=1
-##            if self._target.getConference().getPendingQueuesMgr().isPendingCoordinator(c):
-##                self._target.getConference().getPendingQueuesMgr().removePendingCoordinator(c)
-##                grant=2
-##            #-----
-
-##        c.setEmail(p.get("email",""))
-##
-##        if grant==1:
-##            self._target.grantModification(c)
-##        if grant==2:
-##            self._target.addCoordinator(c)
-
-
-    def _process(self):
-        if self._action != "":
-            if self._action == "perform":
-                self._setConvenerData()
-            url=urlHandlers.UHSessionModification.getURL(self._target)
-            self._redirect(url)
-        else:
-            c=self._target.getConvenerById(self._convId)
-            p=sessions.WPModConvenerEdit(self,self._target)
-            wf = self.getWebFactory()
-            if wf != None:
-                p = wf.getModConvenerEdit(self, self._target)
-            return p.display(convener=c)
 
 

indico/MaKaC/webinterface/tpls/SessionModifMain.tpl

@@ -43 +43 @@
 <tr>
   <td class="dataCaptionTD"><span class="dataCaptionFormat"> ${ _("Default conveners")}</span></td>
-  <form action=${ remConvenersURL } method="POST">
   <td colspan="2">
-  <table width="100%"><tr>
-  <td bgcolor="white" valign="top" class="blacktext">
-    ${ conveners }
-  </td>
-  <td align="right" valign="bottom">
-    <table>
-    <tr>
-      <td>
-        <input type="submit" class="btn" value="${ _("remove")}">
-      </td>
-      </form>
-      <form action=${ newConvenerURL } method="POST">
-      <td>
-        <input type="submit" class="btn" value="${ _("new")}">
-      </td>
-      </form>
-      <form action=${ searchConvenerURL } method="POST">
-      <td>
-        <input type="submit" class="btn" value="${ _("search")}">
-      </td>
-      </form>
-    </tr>
-    </table>
-  </td>
-  </tr></table>
-  </td>
+      <table width="100%">
+          <tr>
+              <td style="width: 80%"><ul id="inPlaceConveners" class="UIPeopleList"></ul></td>
+              <td nowrap valign="top" style="width: 20%; text-align:right;">
+                  <span id="inPlaceConvenersMenu" onmouseover="this.className = 'mouseover'" onmouseout="this.className = ''">
+                      <a class="dropDownMenu fakeLink"  style="margin-left: 15px; margin-right: 15px" onclick="convenerManager.addManagementMenu();">${ _("Add convener")}</a>
+                  </span>
+              </td>
+          </tr>
+       </table>
+   </td>
 </tr>
 <tr>
@@ -76 +60 @@
 </tr>
 </table>
+
+<script>
+
+var convenerManager = new SessionConvenerManager('${ confId }', '${ sessionId }', $E('inPlaceConveners'), $E('inPlaceConvenersMenu'),
+        "convener");
+
+</script>

indico/MaKaC/webinterface/urlHandlers.py

@@ -1138 +1138 @@
     _relativeURL = "confModifSchedule.py/performAddSession"
 
-class UHConfNewSessionConvenerSearch(URLHandler):
-    _relativeURL = "sessionCreation.py/convenerSearch"
-
-class UHConfNewSessionConvenerNew(URLHandler):
-    _relativeURL = "sessionCreation.py/convenerNew"
-
-class UHConfNewSessionPersonAdd(URLHandler):
-    _relativeURL = "sessionCreation.py/personAdd"
-
-class UHSessionDataModificationConvenerSearch(URLHandler):
-    _relativeURL = "sessionModification.py/convenerSearch"
-
-class UHSessionDataModificationConvenerNew(URLHandler):
-    _relativeURL = "sessionModification.py/convenerNew"
-
-class UHSessionDataModificationPersonAdd(URLHandler):
-    _relativeURL = "sessionModification.py/personAdd"
-
-class UHSessionDataModificationNewConvenerSearch(URLHandler):
-    _relativeURL = "sessionModification.py/newConvenerSearch"
-
-class UHSessionDataModificationNewConvenerCreate(URLHandler):
-    _relativeURL = "sessionModification.py/newConvenerCreate"
-
-class UHSessionDataModificationConvenerAdd(URLHandler):
-    _relativeURL = "sessionModification.py/convenerAdd"
 
 class UHConfAddContribution( URLHandler ):
@@ -2446 +2420 @@
 class UHSessionDatesModification( URLHandler ):
     _relativeURL = "sessionModification.py/modifyDates"
-
-class UHSessionModConvenerNew( URLHandler ):
-    _relativeURL = "sessionModification.py/newConvener"
-
-
-class UHSessionModConvenersRem( URLHandler ):
-    _relativeURL = "sessionModification.py/remConveners"
-
-
-class UHSessionModConvenerEdit( URLHandler ):
-    _relativeURL = "sessionModification.py/editConvener"
-
 
 class UHSessionModSlotConvenerNew( URLHandler ):

indico/MaKaC/webinterface/wcomponents.py

@@ -4534 +4534 @@
 
 
-class WConfModParticipEdit(WTemplated):
-
-    def __init__(self,title="",part=None):
-        self._part=part
-        self._ctitle=title
-
-    def getVars(self):
-        vars=WTemplated.getVars(self)
-        vars["postURL"]=quoteattr(str(vars["postURL"]))
-        vars["caption"]=self.htmlText(self._ctitle)
-        title,firstName,familyName="","",""
-        affiliation,email,address,phone,fax="","","","",""
-        if self._part is not None:
-            title=self._part.getTitle()
-            firstName=self._part.getFirstName()
-            familyName=self._part.getFamilyName()
-            affiliation=self._part.getAffiliation()
-            email=self._part.getEmail()
-            address=self._part.getAddress()
-            phone=self._part.getPhone()
-            fax=self._part.getFax()
-        vars["titles"]=TitlesRegistry().getSelectItemsHTML(title)
-        vars["surName"]=quoteattr(familyName)
-        vars["name"]=quoteattr(firstName)
-        vars["affiliation"]=quoteattr(affiliation)
-        vars["email"]=quoteattr(email)
-        vars["address"]=address
-        vars["phone"]=quoteattr(phone)
-        vars["fax"]=quoteattr(fax)
-        if not vars.has_key("addToManagersList"):
-            vars["addToManagersList"]=""
-        return vars
-
 class WSessionModEditDataCode(WTemplated):
 

indico/htdocs/js/indico/Core/Dialogs/Users.js

@@ -1283 +1283 @@
             self.parameterManager = new IndicoUtil.parameterManager();
 
-            var grant = [];
+            var grantSubmission = [];
             var grantManagement = [];
+            var grantCoordination = [];
             var warning = [];
             if (this.grantSubmission) {
-                grant = [$T('Grant submission rights'), $B(Html.checkbox({}), userData.accessor('submission'))];
+                grantSubmission = [$T('Grant submission rights'), $B(Html.checkbox({}), userData.accessor('submission'))];
                 warning = [Html.span({}, Html.span({style:{fontWeight:'bold'}}, $T('Note:')), $T(' If this person does not already have an Indico account, '), Html.br(),
                         $T('he or she will be sent an email asking to register as a user.'), Html.br(),
@@ -1299 +1300 @@
                            $T(' After the account creation the user will automatically be'), Html.br(),
                            $T(' given management rights.'))];
+            }
+
+            if (this.grantCoordination) {
+                grantCoordination = [$T('Give coordination rights.'), $B(Html.checkbox({}), userData.accessor('coordinator'))];
+                warning = [Html.span({}, Html.span({style:{fontWeight:'bold'}}, $T('Note:')), $T(' If this person does not already have an Indico account, '), Html.br(),
+                           $T('he or she will be sent an email asking to create an account.'), Html.br(),
+                           $T(' After the account creation the user will automatically be'), Html.br(),
+                           $T(' given coordination rights.'))];
+            }
+            if (this.grantManagement && this.grantCoordination) {
+                warning = [Html.span({}, Html.span({style:{fontWeight:'bold'}}, $T('Note:')), $T(' If this person does not already have an Indico account, '), Html.br(),
+                        $T('he or she will be sent an email asking to create an account.'), Html.br(),
+                        $T(' After the account creation the user will automatically be'), Html.br(),
+                        $T(' given the rights.'))];
             }
 
@@ -1310 +1325 @@
                [$T('Telephone'), $B(Html.edit({style: {width: '150px'}}), userData.accessor('phone'))],
                [$T('Fax'), $B(Html.edit({style: {width: '150px'}}), userData.accessor('fax'))],
-               grant, grantManagement, warning]);
+               grantSubmission, grantManagement, grantCoordination, warning]);
 
              return this.ExclusivePopupWithButtons.prototype.draw.call(this, form);
@@ -1330 +1345 @@
 
      },
-     function(title, userData, action, grantSubmission, grantManagement, allowEmptyEmail) {
+     function(title, userData, action, grantSubmission, grantManagement, grantCoordination, allowEmptyEmail) {
          this.userData = userData;
          this.action = action;
          this.grantSubmission = exists(grantSubmission)?grantSubmission:false;
          this.grantManagement = exists(grantManagement)?grantManagement:false;
+         this.grantCoordination = exists(grantCoordination)?grantCoordination:false;
          this.allowEmptyEmail = exists(allowEmptyEmail)?allowEmptyEmail:true;
          this.ExclusivePopup(title,  function(){return true;});

indico/htdocs/js/indico/Core/Widgets/UserList.js

@@ -18 +18 @@
  * @param: showGrantSubmissionCB -> Bool, show the checkbox to grant submission rights in the AddNew/Edit popup
  * @param: showAffiliation -> Bool, show the affiliation of the user
+ * @param: showGrantCoordinationCB -> Bool, show the checkbox to grant coordination rights in the AddNew/Edit popup
  */
 type("ListOfUsersManager", [], {
@@ -237 +238 @@
                         newUserPopup.close();
                     }
-                }, self.showGrantSubmissionCB, self.showGrantManagementCB);
+                }, self.showGrantSubmissionCB, self.showGrantManagementCB, self.showGrantCoordinationCB);
         newUserPopup.open();
     },
@@ -260 +261 @@
 
     function(confId, methods, userListParams, inPlaceListElem, showRemoveIcon, showEditIcon, showFavouritesIcon, showOrderArrows,
-             kindOfUser, userCaption, elementClass, showGrantSubmissionCB, showGrantManagementCB, showAffiliation) {
+             kindOfUser, userCaption, elementClass, showGrantSubmissionCB, showGrantManagementCB, showAffiliation, showGrantCoordinationCB) {
         this.conferenceId = confId;
         this.methods = methods;
@@ -275 +276 @@
         this.showGrantManagementCB = showGrantManagementCB;
         this.showAffiliation = showAffiliation;
+        this.showGrantCoordinationCB = showGrantCoordinationCB;
         var self = this;
         if (userListParams) {

indico/htdocs/js/indico/Management/Participants.js

@@ -48 +48 @@
                         newUserPopup.close();
                     }
-                }, false, false, false);
+                }, false, false, false, false);
         newUserPopup.open();
     },

indico/htdocs/js/indico/Management/Sessions.js

@@ -1 +1 @@
 /*
  * Manager for the modification control list of users/groups in session management
- *
  */
 type("SessionControlManager", ["ModificationControlManager"], {
@@ -155 +154 @@
     }
 );
+
+
+/*
+ * Manager for the list of conveners in session management
+ */
+type("SessionConvenerManager", ["ListOfUsersManager"], {
+
+    _getAddExistingParams: function(userList) {
+        var params = {confId: this.confId, sessionId: this.sessionId, userList: userList};
+        return params;
+    },
+
+    _getAddNewParams: function(userData) {
+        var params = {confId: this.confId, sessionId: this.sessionId, userData: userData};
+        return params;
+    },
+
+    _getEditParams: function(userData) {
+        var params = {confId: this.confId, sessionId: this.sessionId, userData: userData, userId: userData.get('id')};
+        return params;
+    },
+
+    _getUserParams: function(userId) {
+        var params = {confId: this.confId, sessionId: this.sessionId, userId: userId};
+        return params;
+    },
+
+    _getModifyUserRightsParams: function(userId, kindOfRights) {
+        var params = {confId: this.confId, sessionId: this.sessionId, userId: userId, kindOfRights: kindOfRights};
+        return params;
+    },
+
+    _getRolesText: function(user) {
+        var text = '(';
+        var counter = 0;
+        if (user['isManager']) {
+            text += $T('Session manager');
+            counter += 1;
+        }
+        if (user['isCoordinator']) {
+            if (counter > 0)
+                text += $T(', Session coordinator');
+            else
+                text += $T('Session coordinator');
+            counter += 1;
+        }
+        if (counter == 0)
+            return null;
+        else
+            return Html.small({style:{paddingLeft:'5px'}}, text + ')');
+    },
+
+    _updateUserList: function(result) {
+        var self = this;
+        // update the user list
+        this.inPlaceListElem.set('');
+        for (var i=0; i<result.length; i++) {
+            var userRowElements = [];
+
+            var userText = Html.span({className:'nameLink', cssFloat:'left'}, result[i]['fullName'], this._getRolesText(result[i]));
+
+            userRowElements.push(userText);
+
+            // Options menu for each user
+            var optionsMenuSpan = Html.span({onmouseover:"this.className = 'mouseover'",
+                                        onmouseout:"this.className = ''", style:{cssFloat:'right'}});
+
+            var optionsMenuLink = Html.a({id:'userMenu_' + result[i]['id'], className:'dropDownMenu fakeLink',
+                                     style:{marginLeft:'15px', marginRight:'15px'}}, $T('More'));
+            this._addParticipantMenu(optionsMenuLink, result[i]);
+            optionsMenuSpan.append(optionsMenuLink);
+            userRowElements.push(optionsMenuSpan);
+
+            // edit icon
+            var imageEdit = Html.img({
+                src: imageSrc("edit"),
+                alt: $T('Edit ') + this.userCaption,
+                title: $T('Edit this ') + this.userCaption,
+                className: 'UIRowButton2',
+                id: 'edit_'+result[i]['id'],
+                style:{cssFloat:'right', cursor:'pointer'}
+            });
+
+            imageEdit.observeClick(function(event) {
+                if (event.target) { // Firefox
+                    var userId = event.target.id.split('_')[1];
+                } else { // IE
+                    var userId = event.srcElement.id.split('_')[1];
+                }
+                self._getUserData(self.methods["getUserData"], self._getUserParams(userId));
+            });
+            userRowElements.push(imageEdit);
+
+            // remove icon
+            var imageRemove = Html.img({
+                src: imageSrc("remove"),
+                alt: $T('Remove ') + this.userCaption,
+                title: $T('Remove this ') + this.userCaption + $T(' from the list'),
+                className: 'UIRowButton2',
+                id: 'remove_'+result[i]['id'],
+                style:{marginRight:'15px', cssFloat:'right', cursor:'pointer'}
+            });
+
+            imageRemove.observeClick(function(event) {
+                if (event.target) { // Firefox
+                    var userId = event.target.id.split('_')[1];
+                } else { // IE
+                    var userId = event.srcElement.id.split('_')[1];
+                }
+                self._manageUserList(self.methods["remove"], self._getUserParams(userId), false);
+            });
+            userRowElements.push(imageRemove);
+
+            var row = Html.li({className: this.elementClass, onmouseover: "this.style.backgroundColor = '#ECECEC';",
+                                onmouseout : "this.style.backgroundColor='#ffffff';", style:{cursor:'auto'}});
+
+            for (var j=userRowElements.length-1; j>=0; j--) { // Done the 'for' like this because of IE7
+                row.append(userRowElements[j]);
+            }
+
+            this.inPlaceListElem.append(row);
+        }
+    },
+
+    _showEditUserPopup: function(userData) {
+        var self = this;
+        // get the user data
+        var user = $O(userData);
+        var editUserPopup = new UserDataPopup(
+                $T('Edit ') + self.userCaption + $T(' data'),
+                user,
+                function(newData) {
+                    if (editUserPopup.parameterManager.check()) {
+                        self._manageUserList(self.methods["edit"], self._getEditParams(newData));
+                        editUserPopup.close();
+                    }
+                }, false, !userData['isManager'], !userData['isCoordinator'], true);
+        editUserPopup.open();
+    },
+
+        addManagementMenu: function(){
+        var self = this;
+        this.inPlaceMenu.observeClick(function(e) {
+            var menuItems = {};
+
+            menuItems[$T('Add existing')] = function(){ self._addExistingUser($T("Add ") + self.userCaption, true, this.confId, false,
+                                                                           true, true, false, true); };
+            menuItems[$T('Add new')] = function(){ self._addNonExistingUser(); };
+
+            var menu = new PopupMenu(menuItems, [self.inPlaceMenu], "popupList");
+            var pos = self.inPlaceMenu.getAbsolutePosition();
+            menu.open(pos.x, pos.y + 20);
+            return false;
+        });
+    },
+
+    _addParticipantMenu: function(element, user) {
+        var self = this;
+
+        element.observeClick(function(e) {
+            var menuItems = {};
+
+            if (!user['isManager']) {
+                menuItems[$T('Give management rights')] = function() {
+                    self._manageUserList(self.methods["grantRights"], self._getModifyUserRightsParams(user['id'], "management"), false);
+                    menu.close();
+                };
+            } else {
+                menuItems[$T('Remove management rights')] = function() {
+                    self._manageUserList(self.methods["revokeRights"], self._getModifyUserRightsParams(user['id'], "management"), false);
+                    menu.close();
+                };
+            }
+
+            if (!user['isCoordinator']) {
+                menuItems[$T('Give coordination rights')] = function() {
+                    self._manageUserList(self.methods["grantRights"], self._getModifyUserRightsParams(user['id'], "coordination"), false);
+                    menu.close();
+                };
+            } else {
+                menuItems[$T('Remove coordination rights')] = function() {
+                    self._manageUserList(self.methods["revokeRights"], self._getModifyUserRightsParams(user['id'], "coordination"), false);
+                    menu.close();
+                };
+            }
+
+            var menu = new PopupMenu(menuItems, [element], "popupList");
+            var pos = element.getAbsolutePosition();
+            menu.open(pos.x, pos.y + 20);
+            return false;
+        });
+    }
+
+},
+
+    function(confId, sessionId, inPlaceListElem, inPlaceMenu, userCaption) {
+        var self = this;
+    this.confId = confId;
+    this.sessionId = sessionId;
+    this.methods = {'addNew': 'session.conveners.addNewConvener',
+                    'addExisting': 'session.conveners.addExistingConvener',
+                    'remove': 'session.conveners.removeConvener',
+                    'edit': 'session.conveners.editConvenerData',
+                    'getUserData': 'session.conveners.getConvenerData',
+                    'getUserList': 'session.conveners.getConvenerList',
+                    'grantRights': 'session.conveners.grantRights',
+                    'revokeRights': 'session.conveners.revokeRights'
+    }
+
+    this.inPlaceMenu = inPlaceMenu;
+
+
+    // params: (confId, methods, userListParams, inPlaceListElem, showRemoveIcon, showEditIcon, showFavouritesIcon, showOrderArrows,
+    // kindOfUser, userCaption, elementClass, showGrantSubmissionCB, showGrantManagementCB, showAffiliation, showGrantCoordiantionCB)
+    this.ListOfUsersManager(confId, this.methods, {confId: confId, sessionId: this.sessionId}, inPlaceListElem, true, true,
+                            false, false, null, userCaption, "UIPerson", false, true, false, true);
+    }
+);

indico/htdocs/sessionCreation.py

@@ -38 +38 @@
     p.createSession( args )
     return "done"
-
-def convenerSearch( req, **params ):
-    return conferenceModif.RHNewSessionConvenerSearch( req ).process( params )
-    
-def convenerNew( req, **params ):
-    return conferenceModif.RHNewSessionConvenerNew( req ).process( params )
-    
-def personAdd( req, **params ):
-    return conferenceModif.RHNewSessionPersonAdd( req ).process( params )
-    

indico/htdocs/sessionModification.py

@@ -31 +31 @@
     return sessionModif.RHSessionDatesModification( req ).process( params )
 
-def convenerSearch( req, **params ):
-    return sessionModif.RHSessionDataModificationConvenerSearch( req ).process( params )
-    
-def convenerNew( req, **params ):
-    return sessionModif.RHSessionDataModificationConvenerNew( req ).process( params )
-    
-def personAdd( req, **params ):
-    return sessionModif.RHSessionDataModificationPersonAdd( req ).process( params )
-
-def newConvenerSearch( req, **params ):
-    return sessionModif.RHSessionDataModificationNewConvenerSearch( req ).process( params )    
-
-def newConvenerCreate( req, **params ):    
-    return sessionModif.RHSessionDataModificationNewConvenerCreate( req ).process( params )    
-
-def convenerAdd( req, **params ):
-    return sessionModif.RHSessionDataModificationConvenerAdd( req ).process( params )
-
 def close( req, **params ):
     return sessionModif.RHSessionClose( req ).process( params )
@@ -55 +37 @@
     return sessionModif.RHSessionOpen( req ).process( params )
 
-def newConvener(req,**params):
-    return sessionModif.RHConvenerNew( req ).process( params)
-
-def remConveners(req, **args):
-    return sessionModif.RHConvenersRem( req ).process( args )
-
-def editConvener(req,**params):
-    return sessionModif.RHConvenerEdit( req ).process( params)
-
 def addMaterial( req, **params ):
     return sessionModif.RHSessionAddMaterial( req ).process( params )
-    
+
 def performAddMaterial( req, **params ):
     return sessionModif.RHSessionPerformAddMaterial( req ).process( params )
-    
+
 def removeMaterials( req, **params ):
     return sessionModif.RHSessionRemoveMaterials( req ).process( params )