Changeset 96485d in indico

Timestamp:

06/15/10 17:22:07 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

c44780

Parents:

e19e71

git-author:

Leszek Syroka <leszek.marek.syroka@…> (06/15/10 16:33:32)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/15/10 17:22:07)

Message:

[FIX] Search conveners give rights

• rights to conveners can be given directly at the search webpage
• fix#343
• reviewed by jbenito: rename of class to adapt it our name conventions

Location:

indico/MaKaC/webinterface

Files:

• pages/sessions.py (modified) (1 diff)
• wcomponents.py (modified) (4 diffs)

indico/MaKaC/webinterface/pages/sessions.py

@@ -876 +876 @@
         else:
             searchLocal = True
-        p = wcomponents.WComplexSelection(self._conf,searchAction,forceWithoutExtAuth=searchLocal)
+        p = wcomponents.WComplexSelection(self._conf,searchAction, addTo = 5, forceWithoutExtAuth=searchLocal)
         return p.getHTML(params)
 

indico/MaKaC/webinterface/wcomponents.py

@@ -4002 +4002 @@
         return wc.getHTML(p)
 
-class WSelectionBoxConvToManager:
+class WSelectionBoxConvToManagerCoordinator:
 
     def getHTML(self):
         wc=WSelectionBox()
         p={
-            "description":  _(""" _("Please check the box if you want to add them as manager/s"):<br><br><i><font color=\"black\"><b> _("Note"): </b></font>_("If this person is not already an Indico user they will be sent an email asking them to create an account. After their registration the user will automatically be given session manager rights").</i><br>"""),\
-            "options":  _("""<input type="checkbox" name="userRole" value="convener"> _("Add as session manager")
+            "description":  _(""" _("Please check the box if you want to add them as managers/coordinators"):"""),\
+            "options":  _("""<input type="checkbox" name="managerControl"> _("Add as session manager")<br>
+                             <input type="checkbox" name="coordinatorControl"> _("Add as session coordinator")
                         """)
           }
@@ -4041 +4042 @@
         #addTo=3: show selection box to add session managers as session conveners
         #addTo=4: show selection box to add submitter as speaker. This is just for meetings
+        #addTo=5: show selection box to add submitter and/or manager rights for convener.
         self._addTo=addTo
 
@@ -4142 +4144 @@
             elif self._addTo==4:
                 sb=WMSelectionBoxAuthors().getHTML()
+            elif self._addTo==5:
+                sb=WSelectionBoxConvToManagerCoordinator().getHTML()
         vars["selectionBox"]=sb
         vars["searchOptions"]=""
@@ -4212 +4216 @@
 
 
-    def __init__(self, target, searchAction, forceWithoutExtAuth=False):
+    def __init__(self, target, searchAction, addTo = 0, forceWithoutExtAuth=False):
         _title = _("Search for users")
-        WUserSelection.__init__(self, searchAction, forceWithoutExtAuth=forceWithoutExtAuth)
+        WUserSelection.__init__(self, searchAction, addTo = addTo, forceWithoutExtAuth=forceWithoutExtAuth)
         try:
             self._conf = target.getConference()