Changeset 611792 in indico

Timestamp:

05/30/11 18:09:48 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 10eafd9ae230cbad5d99d5aaf22c24724fb6c98f

Children:

699502

Parents:

725fcf

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (05/30/11 18:08:03)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/30/11 18:09:48)

Message:

[FIX] Problem of empty link

• No need for migration script;

Files:

• bin/migration/migrate_0.97_0.98.py (modified) (3 diffs)
• indico/MaKaC/webinterface/displayMgr.py (modified) (1 diff)

bin/migration/migrate_0.97_0.98.py

@@ -34 +34 @@
 from MaKaC.registration import RegistrantSession, RegistrationSession
 from MaKaC.plugins.RoomBooking.default.dalManager import DALManager
-from MaKaC.webinterface.displayMgr import ConfDisplayMgrRegistery, SystemLink
 
 from indico.ext import livesync
@@ -117 +116 @@
 
 
-def _fixEmptyURLs(obj):
-    menu = ConfDisplayMgrRegistery().getDisplayMgr(obj).getMenu()
-    for l in menu.getLinkList():
-        if type(l) == SystemLink and not hasattr(l, '_URL') and l.getCaption() == '' \
-               and l.getName() == 'manageabstractreviewing':
-            menu._listLink.remove(l)
-
-
 def runCategoryACMigration(dbi, withRBDB):
     """
@@ -162 +153 @@
             # convert them to the new object classes.
             _convertAlarms(obj)
-
-            _fixEmptyURLs(obj)
 
         _fixAccessController(obj,

indico/MaKaC/webinterface/displayMgr.py

@@ -288 +288 @@
                     elif link.getParent().getName() != linksData[link.getName()]["parent"]:
                         link.getParent().removeLink(link)
+                elif link.getName() not in linksData:
+                    # link was removed from the list
+                    self.removeLink(link)
 
         #Now, update the system links