Changeset ca8a8d in indico

Timestamp:

08/08/11 12:08:32 (22 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

dea114

Parents:

fc5f5b

git-author:

Jose Benito <jose.benito.gonzalez@…> (08/08/11 12:07:46)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/08/11 12:08:32)

Message:

[FIX] Refactor canAccess method

Location:

indico/MaKaC

Files:

• conference.py (modified) (1 diff)
• plugins/Collaboration/pages.py (modified) (1 diff)
• webinterface/pages/errors.py (modified) (1 diff)
• webinterface/tpls/ConfAccessControlFrame.tpl (modified) (2 diffs)

indico/MaKaC/conference.py

@@ -3793 +3793 @@
         if self.__ac.isHarvesterIP(aw.getIP()):
             return True
-        #####################################################
-        if self.getAccessKey()!= "":
-            if self.canKeyAccess( aw ) and not self.canUserModify(aw.getUser()) and not self.isAllowedToAccess( aw.getUser() ):
-                return False
-        elif not self.canIPAccess(aw.getIP()) and not self.canUserModify(aw.getUser()) and not self.isAllowedToAccess( aw.getUser() ):
-            return False
-        if not self.isProtected():
-            return True
-        return self.isAllowedToAccess( aw.getUser() )
+
+        if self.isProtected():
+            if self.canUserModify(aw.getUser()) or self.isAllowedToAccess( aw.getUser() ):
+                return True
+            else:
+                return self.canKeyAccess(aw)
+        else:
+            return self.canIPAccess(aw.getIP())
 
     def canKeyAccess( self, aw, key=None ):

indico/MaKaC/plugins/Collaboration/pages.py

@@ -69 +69 @@
         vars['getBookingType'] = WEventDetailBanner.getBookingType
         vars['formatTwoDates'] = formatTwoDates
+        return vars
 
 

indico/MaKaC/webinterface/pages/errors.py

@@ -208 +208 @@
 
     def _getBody( self, params ):
-        if self._rh._target and (self._rh._target.getAccessKey() != "" or ( (not type(self._rh._target) is Category) and self._rh._target.getConference().getAccessKey() != "")):
+        tgt = self._rh._target
+        if tgt and tgt.isProtected() and (tgt.getAccessKey() != "" or \
+                                          ( (not type(tgt) is Category) and tgt.getConference().getAccessKey() != "")):
             msg = ""
             sess = self._rh._getSession()
             keys = sess.getVar("accessKeys")
-            id = self._rh._target.getUniqueId()
+            id = tgt.getUniqueId()
             if keys != None and keys.has_key(id):
                 msg = i18nformat("""<font color=red> _("Bad access key")!</font>""")

indico/MaKaC/webinterface/tpls/ConfAccessControlFrame.tpl

@@ -10 +10 @@
     parentPrivacy=parentPrivacy, statusColor = statusColor, parentStatusColor=parentStatusColor,
     locator=locator, isFullyPublic=isFullyPublic"/>
+    % if privacy != 'PUBLIC':
     <tr>
         <td class="titleCellTD"><span class="titleCellFormat">${ _("Access key")}</span></td>
@@ -49 +50 @@
         </td>
     </tr>
+    % endif
 </table>