diff --git a/mycoserver/group.py b/mycoserver/group.py index 564faef..ff3c7d6 100644 --- a/mycoserver/group.py +++ b/mycoserver/group.py @@ -123,6 +123,8 @@ class Group(object): for uuid in group.deletedContributions: if uuid not in ret.deletedContributions: ret.deletedContributions[uuid]=group.deletedContributions[uuid] + elif ret.deletedContributions[uuid].lastChangeret.deletedContributions[uuid].lastChange: ret.contributions[uuid]=self.contributions[uuid] + del ret.deletedContributions[uuid] for uuid in group.contributions: if uuid not in ret.contributions: if uuid not in ret.deletedContributions: ret.contributions[uuid]=group.contributions[uuid] elif group.contributions[uuid].lastChange>ret.deletedContributions[uuid].lastChange: ret.contributions[uuid]=group.contributions[uuid] + del ret.deletedContributions[uuid] return ret