Changeset 181d5f in indico

Timestamp:

06/23/11 14:42:08 (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, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

8776b1

Parents:

a7cc00

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (05/16/11 12:56:44)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (06/23/11 14:42:08)

Message:

[FIX] Update user profile when deleting conference

• When deleting a conference or category the managers are deleted.
• Fix to previous deleted conferences and categories.
• Closes task #596.

Location:

indico/MaKaC/webinterface

Files:

• pages/admins.py (modified) (2 diffs)
• rh/categoryMod.py (modified) (2 diffs)

indico/MaKaC/webinterface/pages/admins.py

@@ -56 +56 @@
 from MaKaC.fossils.modules import INewsItemFossil
 from indico.modules import ModuleHolder
+from MaKaC.errors import MaKaCError
+from MaKaC.conference import ConferenceHolder
+from MaKaC.webinterface.locators import CategoryWebLocator
 
 class WPAdminsBase( WPMainBase ):
@@ -1467 +1470 @@
         categs = u.getLinkTo("category","manager")
         for categ in categs:
-            vars["categoryManager"] += """<a href="%s">%s</a><br>""" % (urlHandlers.UHCategoryDisplay.getURL(categ), categ.getTitle())
+            target = CategoryWebLocator({"categId": categ.getId()}).getObject()
+            if target == None:
+                u.unlinkTo(categ,"manager")
+            else:
+                vars["categoryManager"] += """<a href="%s">%s</a><br>""" % (urlHandlers.UHCategoryDisplay.getURL(categ), categ.getTitle())
+
         vars["eventManager"] = ""
+        ch = ConferenceHolder()
         events = u.getLinkTo("conference","manager")
         for event in events:
-            vars["eventManager"] += """<a href="%s">%s</a><br>""" % (urlHandlers.UHConferenceDisplay.getURL(event), event.getTitle())
+            try:
+                ch.getById(event.getId())
+                vars["eventManager"] += """<a href="%s">%s</a><br>""" % (urlHandlers.UHConferenceDisplay.getURL(event), event.getTitle())
+            except MaKaCError, e:
+                u.unlinkTo(event,"manager")
+
         return vars
 

indico/MaKaC/webinterface/rh/categoryMod.py

@@ -409 +409 @@
     def perform( self ):
         for categ in self._categs:
+            for manager in categ.getManagerList():
+                categ.revokeModification(manager)
             categ.delete()
 
@@ -510 +512 @@
     def perform( self,confs ):
         for event in confs:
+            for manager in event.getManagerList():
+                event.revokeModification(manager)
             event.delete()
-
 
     def askConfirmation( self, params ):