Changeset 62bc56 in indico

Timestamp:

06/22/10 17:38:11 (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:

92c5b8

Parents:

8e6801

git-author:

Leszek Syroka <leszek.marek.syroka@…> (05/28/10 17:13:11)

git-committer:

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

Message:

[FIX] Cloning conference menu

• entries in conference menu are now cloned properly
• method 'clone' added to 'SystemLink?' class
• fix#414
• reviewed by jbenito: small fixes.

File:

• indico/MaKaC/webinterface/displayMgr.py (modified) (3 diffs)

indico/MaKaC/webinterface/displayMgr.py

@@ -126 +126 @@
 
     def clone(self, conf):
-        newCdm = ConfDisplayMgrRegistery().getDisplayMgr(conf)
+        newCdm = ConfDisplayMgrRegistery().getDisplayMgr(conf, update=False)
         # default style
         newCdm.setDefaultStyle(self.getDefaultStyle())
@@ -257 +257 @@
         for link in self.getLinkList():
             id = link.getId()
-            newLink = None
-            if newMenu.getLinkById(id) != None:
-                newLink = newMenu.getLinkById(id)
-            elif type(link) is ExternLink:
-                newLink = link.clone(newMenu)
-            if newLink != None:
-                newList.append(newLink)
+            newList.append(link.clone(newMenu))
         if len(newList) != 0:
             newMenu._listLink = newList
@@ -755 +749 @@
     """
     Type = "system"
+
+    def clone(self, newMenu):
+        newLink = SystemLink(self.getName(), newMenu)
+        newLink.setEnabled(self.isEnabled())
+        newLink.setVisible(self.isVisible())
+        newLink.setId(self.getId())
+        newLink.setDisplayTarget(self.getDisplayTarget())
+        newLink.setCaption(self.getCaption(), store = True)
+        newLink.setURL(self.getURL())
+        newLink.setStaticURL(self.getStaticURL())
+
+        listLink = []
+        for link in self.getLinkList():
+            listLink.append(link.clone(newLink))
+
+        newLink._listLink = listLink
+
+        return newLink
 
     def getURL(self):