Changeset cde487 in indico

Timestamp:

04/26/12 10:47:01 (13 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

a71adaa

Parents:

88caaa

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/26/12 10:43:19)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/26/12 10:47:01)

Message:

[FIX] Unnecessary commit

• visibility was being set on every access to getVisibility() for the home category, due to a try..except clause;

Location:

indico/MaKaC

Files:

• common/db.py (modified) (2 diffs)
• conference.py (modified) (1 diff)
• webinterface/rh/base.py (modified) (1 diff)
• webinterface/rh/categoryDisplay.py (modified) (2 diffs)

indico/MaKaC/common/db.py

@@ -35 +35 @@
 from MaKaC.consoleScripts.installBase import getIndicoInstallMode
 skip_imports = getIndicoInstallMode()
+
 
 if not skip_imports:
@@ -111 +112 @@
         self._conn.conn = None
 
-
     def startRequest( self ):
         """Initialise the DB and starts a new transaction.

indico/MaKaC/conference.py

@@ -826 +826 @@
 
     def getVisibility ( self ):
-        # TODO: Check if this actually works
-        # since getOwner() can be None (root categ)
-        try:
-            return max(0,min(int(self._visibility), self.getOwner().getVisibility()+1))
-        except:
-            self._visibility = 999
-            return 999
+        """
+        Returns category visibility, considering that it can be
+        restricted by parent categories
+        """
+        owner = self.getOwner()
+        visibility = int(self._visibility)
+
+        # visibility can be restricted by parent categories
+        if owner:
+            return max(0, min(visibility, owner.getVisibility() + 1))
+        else:
+            return visibility
 
     def setVisibility( self, visibility=999 ):

indico/MaKaC/webinterface/rh/base.py

@@ -504 +504 @@
         if self._checkHttpsRedirect():
             return
+
 
         DBMgr.getInstance().startRequest()

indico/MaKaC/webinterface/rh/categoryDisplay.py

@@ -553 +553 @@
         self._req.content_type = """%s"""%(mimetype)
         self._req.headers_out["Content-Disposition"] = """inline; filename="%s\""""%filename.replace("\r\n"," ")
+
         return data
 
@@ -580 +581 @@
         mimetype = cfg.getFileTypeMimeType( "ATOM" )
         self._req.content_type = """%s"""%(mimetype)
+
         return data