Changeset 94242c in indico

Timestamp:

03/16/11 18:37:31 (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, 4287315ec967a3da168d83963c14001db8487d53

Children:

9f305e

Parents:

458c17

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/16/11 17:52:19)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/16/11 18:37:31)

Message:

[FIX] Livesync - missing notifications

• Category modifications were being silently ignored due to an added "continue";
• Fixed ACL modification that didn't get to metadata;
• Commented out access control code that is still only half-implemented;

Location:

indico/ext/livesync

Files:

• bistate.py (modified) (1 diff)
• components.py (modified) (3 diffs)

indico/ext/livesync/bistate.py

@@ -93 +93 @@
             obj = aw.getObject()
 
-            if  isinstance(obj, conference.Category) or \
-                   not obj.canAccess(AccessWrapper(access)):
-                # category? no access? jump over this one
-                continue
-
-            if obj not in records:
-                records[obj] = 0
+            ## TODO: enable this, whenn config is possible from interface
+            ## if obj.canAccess(AccessWrapper(access)):
+            ##     # no access? jump over this one
+            ##     continue
 
             for action in aw.getActions():
-                if action == 'deleted':
+                if action == 'deleted' and not isinstance(obj, conference.Category):
                     # if the record has been deleted, mark it as such
                     # nothing else will matter
-                    records[obj] |= STATUS_DELETED
+                    cls._setStatus(records, obj, STATUS_DELETED)
 
-                elif action == 'created':
+                elif action == 'created' and not isinstance(obj, conference.Category):
                     # if the record has been created, mark it as such
-                    records[obj] |= STATUS_CREATED
+                    cls._setStatus(records, obj, STATUS_CREATED)
 
-                elif action in ['data_changed', 'acl_changed', 'moved']:
-                    # categories are ignored
-                    records[obj] |= STATUS_CHANGED
-
-                elif action in ['set_private', 'set_public']:
+                elif action in ['set_private', 'set_public', 'data_changed',
+                                'acl_changed', 'moved']:
                     # protection changes have to be handled more carefully
                     cls._computeProtectionChanges(obj, action, records)

indico/ext/livesync/components.py

@@ -43 +43 @@
 from MaKaC.common.contextManager import ContextManager
 from MaKaC.common.logger import Logger
-from MaKaC import conference
+from MaKaC import conference, accessControl
 
 
@@ -74 +74 @@
                 Logger.get('ext.livesync').debug((obj, action))
                 # TODO: remove redundant items
-                sm.add(timestamp,
-                       ActionWrapper(timestamp, obj, actions))
+            sm.add(timestamp,
+                   ActionWrapper(timestamp, obj, actions))
 
     def requestRetry(self, obj, req, nretry):
@@ -196 +196 @@
             else:
                 self._objectInfoChanged(obj, 'acl')
+        elif isinstance(obj, accessControl.AccessController):
+            self._aclChanged(obj.getOwner(), child=False)
         else:
             self._aclChanged(obj.getOwner(), child=True)