Changeset c8a3670 in indico

Timestamp:

04/06/11 14:11:33 (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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

01f384

Parents:

a2828e

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/06/11 14:09:41)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/06/11 14:11:33)

Message:

[FIX] Merging avatars: ignoring deleted objects

• Added a warning, so that we can try to find out why this happens;

File:

• indico/MaKaC/user.py (modified) (3 diffs)

indico/MaKaC/user.py

@@ -45 +45 @@
 
 from MaKaC.common.PickleJar import Updates
+from MaKaC.common.logger import Logger
 
 #import ldap
@@ -1586 +1587 @@
             if objType == "category":
                 for role in links[objType].keys():
-                    if role == "creator":
-                        for cat in links[objType][role]:
+                    for cat in links[objType][role]:
+                        # if the category has been deleted
+                        if cat.getOwner() == None and cat.getId() != '0':
+                            Logger.get('user.merge').warning(
+                                "Trying to remove %s from %s (%s) but it seems to have been deleted" % \
+                                (cat, prin.getId(), role))
+                            continue
+                        elif role == "creator":
                             cat.revokeConferenceCreation(merged)
                             cat.grantConferenceCreation(prin)
-                    elif role == "manager":
-                        for cat in links[objType][role]:
+                        elif role == "manager":
                             cat.revokeModification(merged)
                             cat.grantModification(prin)
-                    elif role == "access":
-                        for cat in links[objType][role]:
+                        elif role == "access":
                             cat.revokeAccess(merged)
                             cat.grantAccess(prin)
@@ -1601 +1606 @@
             elif objType == "conference":
                 for role in links[objType].keys():
-                    if role == "creator":
-                        for conf in links[objType][role]:
+                    for conf in links[objType][role]:
+                        # if the conference has been deleted
+                        if conf.getOwner() == None:
+                            Logger.get('user.merge').warning(
+                                "Trying to remove %s from %s (%s) but it seems to have been deleted" % \
+                                (conf, prin.getId(), role))
+                            continue
+                        elif role == "creator":
                             conf._setCreator(prin)
-                    elif role == "chair":
-                        for conf in links[objType][role]:
+                        elif role == "chair":
                             conf.removeChair(merged)
                             conf.addChair(prin)
-                    elif role == "manager":
-                        for conf in links[objType][role]:
+                        elif role == "manager":
                             conf.revokeModification(merged)
                             conf.grantModification(prin)
-                    elif role == "access":
-                        for conf in links[objType][role]:
+                        elif role == "access":
                             conf.revokeAccess(merged)
                             conf.grantAccess(prin)
-                    elif role == "abstractSubmitter":
-                        for conf in links[objType][role]:
+                        elif role == "abstractSubmitter":
                             conf.removeAuthorizedSubmitter(merged)
                             conf.addAuthorizedSubmitter(prin)