Changeset c174b7 in indico

Timestamp:

11/27/09 17:12:43 (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:

f1a1efb

Parents:

955d01

git-author:

Cesar Munoz Orena <cesar.munoz.orena@…> (11/26/09 15:15:31)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (11/27/09 17:12:43)

Message:

[IMPROVEMENT] Possible deleting nonReg in modContr

• The main problem of the ticket (non checking duplicate emails when an non-registered Indico user is added twice in the Modification control managers) seems to be now working, but since apparently no changes have been made in that part it looks quite strange that is now working properly, so we'd better wait for more feedback to confirm this.

• The improvement comes because now it's possible to delete non-registered users in that field.

• improves #39.

Location:

indico/MaKaC

Files:

• accessControl.py (modified) (1 diff)
• conference.py (modified) (3 diffs)
• webinterface/rh/conferenceModif.py (modified) (2 diffs)
• webinterface/tpls/PendingUserTableItem.tpl (added)
• webinterface/wcomponents.py (modified) (2 diffs)

indico/MaKaC/accessControl.py

@@ -212 +212 @@
     
     def grantModificationEmail(self, email):
+        """looks if the email is in the managersEmail list (list with the users with access to modification)
+        and if it's not it adds the email to the list"""
         if not email in self.getModificationEmail():
             self.getModificationEmail().append(email)

indico/MaKaC/conference.py

@@ -3876 +3876 @@
             email = prin.getEmail()
         elif isinstance(prin, str):
-            email = prin
+            email = prin 
         if email != None:
             if email == "":
@@ -3882 +3882 @@
             ah = AvatarHolder()
             results=ah.match({"email":email}, exact=1)
+            #No registered user in Indico with that email
             if len(results) == 0:
                 self.__ac.grantModificationEmail(email)
@@ -3887 +3888 @@
                     notif = pendingQueues._PendingConfManagerNotification( [prin] )
                     mail.GenericMailer.sendAndLog( notif, self.getConference() )
+            #The user is registered in Indico and is activated as well
             elif len(results) == 1 and results[0] is not None and results[0].isActivated():
                 self.__ac.grantModification(results[0])
-                results[0].linkTo(self, "manager")
+                results[0].linkTo(self, "manager") 
         else:
             self.__ac.grantModification( prin )

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -359 +359 @@
         chair.setFax(p.get("fax",""))
         self._target.addChair(chair)
+        #If the chairperson needs to be given management rights
         if p.get("manager", None):
             avl = user.AvatarHolder().match({"email":p.get("email","")})
@@ -365 +366 @@
                 self._target.grantModification(av)
             else:
+                #Apart from granting the chairman, we add it as an Indico user
                 self._target.grantModification(chair)
 

indico/MaKaC/webinterface/wcomponents.py

@@ -1904 +1904 @@
         return vars
 
+class WPendingUserTableItem(WTemplated):
+
+    def getHTML( self, email, selectable=True ):
+        self.email = email
+        self._selectable = selectable
+        return WTemplated.getHTML( self, {} )
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+        vars["email"] = self.email
+        vars["selectable"] = self._selectable
+
+        return vars
 
 class WGroupTableItem(WTemplated):
@@ -2011 +2024 @@
                 ul.append( WGroupTableItem().getHTML( principal, selected, self.__selectable ) )
         for email in self.__pendings:
-            ul.append( _("""<input type="checkbox" name="selectedPrincipals" value="%s" > <span class="blacktext">%s <small> _("(Pending)")</small></span><br>""")%(email, email))
+            ul.append(WPendingUserTableItem().getHTML(email, self.__selectable))
         vars["userItems"] = "".join( ul )
         return vars