Mailing list archives: August 2007

Site index · List index
Message list1 · 2 · Next »Thread · Author · Date
<insightfxidwwil...@mightysideshow.com> exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 01 Jan, 18:00
ja...@wordzoo.com coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;quot;%(location)s does not exist&amp;quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Resources on server: %(resources)s&amp;quot;) % \ &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- {'resources':sharingSelf.resourceList}) &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'resources':self.resourceList}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Manifest: %(manifest)s&amp;quot;) % \ &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- {'manifest':sharingSelf.manifest}) &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'manifest':self.manifest}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users&lt;/pre&gt; Thu, 24 Apr, 14:24
ja...@wordzoo.com ; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Thu, 24 Apr, 14:24
Parlante oes.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 09 Apr, 03:30
Parlante f.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 09 Apr, 03:30
Parlante f.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 09 Apr, 03:30
Parlante f.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 09 Apr, 03:30
ghoff ss="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 31 Jul, 21:15
em">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 07 Apr, 02:32
sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 07 Apr, 02:32
bl...@orcaware.com ot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 21 Mar, 18:18
ic nglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 07 Jun, 03:49
ser class="cx"> Wed, 21 Feb, 10:03
ser class="cx"> Wed, 21 Feb, 10:03
b.@osafoundation.org ng does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Mani s def onSetContentsEvent (self, event): &lt;/span&gt;&lt;span class="rem"&gt;- self.setContentsOnBlock (event.arguments ['item']) &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="rem"&gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &lt;/span&gt;&lt;span class="add"&gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; &lt;/span&gt;&lt;span class="add"&gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &lt;/span&gt;&lt;span class="lines"&gt;@@ -730,20 +732,12 @@ &lt;/span&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Thu, 25 Apr, 03:33
<ka...@uclink.berkeley.edu> ="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 21 May, 04:38
s class="cx"> Tue, 21 May, 04:38
7.@gmx.at> [No Subject] Fri, 15 Nov, 08:32
7.@gmx.at> [No Subject] Fri, 15 Nov, 08:32
7.@gmx.at> [No Subject] Fri, 15 Nov, 08:32
7.@gmx.at> [No Subject] Fri, 15 Nov, 08:32
ode-bear.com> le'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 20 Oct, 10:37
.com ___________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 05 Mar, 00:46
d...@kei.com> pan&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Thu, 03 Oct, 23:00
r..@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Thu, 30 Jan, 06:45
va...@osafoundation.org> pan&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 13 Mar, 15:31
va...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 13 Mar, 15:31
va...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 13 Mar, 15:31
va...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 13 Mar, 15:31
va...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 13 Mar, 15:31
e pre> Thu, 08 Apr, 18:59
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
m.@osafoundation.org> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 03 May, 09:42
o.@aetiologic.ca> yCollection = self.blockItem.contentsCollection &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; # First generate a sorted list of Time&lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- if sharingView is None: - sharingView = self.itsView &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ if not self.exists(): + raise NotFound(_(u&amp;quot;%(location)s does not exist&amp;quot;) % + {'location': location}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ self.resourceList = self._getResourceList(location) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- # &amp;quot;self&amp;quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&amp;quot;Starting GET of %s&amp;quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&amp;quot;%(location)s does not exist&amp;quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Resources on server: %(resources)s&amp;quot;) % \ &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- {'resources':sharingSelf.resourceList}) &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'resources':self.resourceList}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Mani s def onSetContentsEvent (self, event): &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- self.setContentsOnBlock (event.arguments ['item']) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; &amp;amp;quot;&amp;amp;quot;&amp;amp;quot; &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- Clear the selection each time we view a new contents until we get - a selection added to the contents item -- DJA &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;add&quot;&amp;gt;+ Make sure to update the selection, keeping any items that are + still in the newly selected collection, since items can be in + multiple collections. + + This also accounts for the case where multiple collections are + selected in the sidebar, and the user is selecting different + ones - the actual items visible don't change, but their + coloring does.. so you want to maintain selection. &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; &amp;amp;quot;&amp;amp;quot;&amp;amp;quot; &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;add&quot;&amp;gt;+ contents = event.arguments['item'] + # collectionList[0] is the currently selected collection in + # the sidebar + contentsCollection = contents.collectionList[0] + self.setContentsOnBlock(contents, contentsCollection) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; for item in self.selection: if item not in self.contents: self.selection.remove(item) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;lines&quot;&amp;gt;@@ -730,20 +732,12 @@ &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; &amp;amp;quot;&amp;amp;quot;&amp;amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- 'selectAll': self.selectAllMode}) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;add&quot;&amp;gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;lines&quot;&amp;gt;@@ -754,7 +748,7 @@ &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; def DeleteSelection(self): for item in self.selection: &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- item.removeFromCollection(self.contents.collectionList[0]) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;add&quot;&amp;gt;+ item.removeFromCollection(self.contentsCollection) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; self.ClearSelection() def ClearSelection(self): &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;lines&quot;&amp;gt;@@ -762,16 +756,5 @@ &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; self.postSelectItemsBroadcast() def CanAdd(self): &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- return not self.contents.collectionList[0].isReadOnly() &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;add&quot;&amp;gt;+ return not self.contentsCollection.isReadOnly() &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- def CanRemove(self): - return (len(self.selection) &amp;amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;amp;quot;Delete from '%(collectionName)s'&amp;amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &amp;lt;/span&amp;gt;&amp;lt;/pre&amp;gt;&amp;lt;/div&amp;gt; &amp;lt;a id=&quot;branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy&quot;&amp;gt;&amp;lt;/a&amp;gt; &amp;lt;div class=&quot;modfile&quot;&amp;gt;&amp;lt;h4&amp;gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&amp;gt; 8370)&amp;lt;/h4&amp;gt; &amp;lt;pre class=&quot;diff&quot;&amp;gt; &amp;lt;span class=&quot;info&quot;&amp;gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;lines&quot;&amp;gt;@@ -343,7 +343,7 @@ &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; currentDragBox = None &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;rem&quot;&amp;gt;- primaryCollection = self.blockItem.contents.collectionList[0] &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;add&quot;&amp;gt;+ primaryCollection = self.blockItem.contentsCollection &amp;lt;/span&amp;gt;&amp;lt;span class=&quot;cx&quot;&amp;gt; # First generate a sorted list of Time&lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- if sharingView is None: - sharingView = self.itsView &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ if not self.exists(): + raise NotFound(_(u&amp;quot;%(location)s does not exist&amp;quot;) % + {'location': location}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ self.resourceList = self._getResourceList(location) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- # &amp;quot;self&amp;quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&amp;quot;Starting GET of %s&amp;quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&amp;quot;%(location)s does not exist&amp;quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Resources on server: %(resources)s&amp;quot;) % \ &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- {'resources':sharingSelf.resourceList}) &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'resources':self.resourceList}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Manifest: %(manifest)s&amp;quot;) % \ &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- {'manifest':sharingSelf.manifest}) &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'manifest':self.manifest}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users&lt;/pre&gt; Sun, 28 Sep, 11:53
o.@aetiologic.ca> &quot;&gt;- {'resources':sharingSelf.resourceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Sun, 28 Sep, 11:53
o.@aetiologic.ca> &quot;&gt;- {'resources':sharingSelf.resourceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Sun, 28 Sep, 11:53
="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 09 Apr, 18:32
ia iew[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
ia {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Mon, 26 May, 09:29
<mor...@sagen.com> e a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 18 Nov, 07:51
<mor...@osafoundation.org> 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 18 Nov, 07:51
<mor...@osafoundation.org> e a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 18 Nov, 07:51
<mor...@osafoundation.org> e a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 18 Nov, 07:51
eton __________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sun, 13 Nov, 20:15
<andre_mueningh...@fastmail.fm> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 28 May, 18:41
<andre_mueningh...@fastmail.fm> does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 28 May, 18:41
is ceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Sun, 22 Jun, 20:09
is ceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Sun, 22 Jun, 20:09
is ceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Sun, 22 Jun, 20:09
is ceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Sun, 22 Jun, 20:09
<harts...@osafoundation.org> </pre> Sun, 12 Apr, 21:12
<harts...@osafoundation.org> </pre> Sun, 12 Apr, 21:12
<postmas...@laweleka.osafoundation.org> on}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 05 Aug, 17:04
<postmas...@laweleka.osafoundation.org> on}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 05 Aug, 17:04
<postmas...@laweleka.osafoundation.org> _________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 05 Aug, 17:04
<postmas...@laweleka.osafoundation.org> _________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 05 Aug, 17:04
<postmas...@laweleka.osafoundation.org> _________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 05 Aug, 17:04
<postmas...@laweleka.osafoundation.org> _________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 05 Aug, 17:04
nen [No Subject] Wed, 11 Jan, 14:11
sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 30 Nov, 14:35
sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 30 Nov, 14:35
s ngSelf.resourceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Mon, 11 Nov, 19:05
s ngSelf.resourceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Mon, 11 Nov, 19:05
s ngSelf.resourceList}) &lt;/span&gt;&lt;span class=&st:%(manifest)s&quot;)%\</span> Mon, 11 Nov, 19:05
<...@osafoundation.org> cation}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 12 May, 17:36
<...@osafoundation.org> _____________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 12 May, 17:36
<rcott...@cottiss.com> ot exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 22 Jun, 00:06
<rcott...@cottiss.com> ot exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 22 Jun, 00:06
<rcott...@cottiss.com> ot exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 22 Jun, 00:06
<rcott...@cottiss.com> ot exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 22 Jun, 00:06
<rcott...@cottiss.com> ot exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 22 Jun, 00:06
<rcott...@cottiss.com> ot exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Sat, 22 Jun, 00:06
nnco...@ameritech.net> def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = shangView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': locat;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'resources':self.resourceList}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; logger.debug(_(u&amp;quot;Manifest: %(manifest)s&amp;quot;) % \ &lt;/span&gt;&lt;span class=&quot;rem&quot;&gt;- {'manifest':sharingSelf.manifest}) &lt;/span&gt;&lt;span class=&quot;add&quot;&gt;+ {'manifest':self.manifest}) &lt;/span&gt;&lt;span class=&quot;cx&quot;&gt; # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users&lt;/pre&gt; Wed, 11 Feb, 01:51
nnco...@ameritech.net> ntUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Wed, 11 Feb, 01:51
sut > Fri, 06 Mar, 15:55
sut > Fri, 06 Mar, 15:55
sut > Fri, 06 Mar, 15:55
<proje...@modernactivity.com> n class="add"&gt;+ source = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; for item in itemList: item.addToCollection(source) &lt;/span&gt;&lt;span class="lines"&gt;@@ -1635,7 +1638,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; return # update the calendar with the calender's color &lt;/span&gt;&lt;span class="rem"&gt;- collection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ collection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # force the creation of the . Sat, 06 Sep, 20:54
e...@kei.com> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
e...@kei.com> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
e...@kei.com> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
est...@osafoundation.org> pan&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
est...@osafoundation.org> pan&gt;&lt;span class="cx"&gt; &amp;quot;&amp;quot;&amp;quot; self.postEventByName('SelectItemsBroadcast', {'items': self.selection, &lt;/span&gt;&lt;span class="rem"&gt;- 'selectAll': self.selectAllMode}) &lt;/span&gt;&lt;span class="add"&gt;+ 'selectAll': self.selectAllMode, + 'collection': self.contentsCollection}) &lt;/span&gt;&lt;span class="cx"&gt; def SelectCollectionInSidebar(self, collection): self.postEventByName('RequestSelectSidebarItem', {'item':collection}) &lt;/span&gt;&lt;span class="rem"&gt;- def onDeleteEvent(self, event): - trash = schema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
est...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
est...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
est...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
est...@osafoundation.org> hema.ns('osaf.app', self).TrashCollection - for item in self.selection: - item.addToCollection(trash) - self.ClearSelection() - - def onRemoveEvent(self, event): - self.DeleteSelection() - &lt;/span&gt;&lt;span class="cx"&gt; def onSelectAllEvent(self, event): self.selection = list(self.contents) self.selectAllMode = True &lt;/span&gt;&lt;span class="lines"&gt;@@ -754,7 +748,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; def DeleteSelection(self): for item in self.selection: &lt;/span&gt;&lt;span class="rem"&gt;- item.removeFromCollection(self.contents.collectionList[0]) &lt;/span&gt;&lt;span class="add"&gt;+ item.removeFromCollection(self.contentsCollection) &lt;/span&gt;&lt;span class="cx"&gt; self.ClearSelection() def ClearSelection(self): &lt;/span&gt;&lt;span class="lines"&gt;@@ -762,16 +756,5 @@ &lt;/span&gt;&lt;span class="cx"&gt; self.postSelectItemsBroadcast() def CanAdd(self): &lt;/span&gt;&lt;span class="rem"&gt;- return not self.contents.collectionList[0].isReadOnly() &lt;/span&gt;&lt;span class="add"&gt;+ return not self.contentsCollection.isReadOnly() &lt;/span&gt;&lt;span class="cx"&gt; &lt;/span&gt;&lt;span class="rem"&gt;- def CanRemove(self): - return (len(self.selection) &amp;gt; 0 and - not self.contents.collectionList[0].isReadOnly()) - - def onRemoveEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - event.arguments['Text'] = _(u&amp;quot;Delete from '%(collectionName)s'&amp;quot;) % {'collectionName': self.contents.collectionList[0].displayName} - - def onDeleteEventUpdateUI(self, event): - event.arguments['Enable'] = self.CanRemove() - &lt;/span&gt;&lt;/pre&gt;&lt;/div&gt; &lt;a id="branchesandichandlerparcelsosafframeworkblockscalendarTimedCanvaspy"&gt;&lt;/a&gt; &lt;div class="modfile"&gt;&lt;h4&gt;Modified: branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py (8369 =&gt; 8370)&lt;/h4&gt; &lt;pre class="diff"&gt; &lt;span class="info"&gt;--- branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:04:48 UTC (rev 8369) +++ branches/andi/chandler/parcels/osaf/framework/blocks/calendar/TimedCanvas.py 2005-11-21 19:27:12 UTC (rev 8370) &lt;/span&gt;&lt;span class="lines"&gt;@@ -343,7 +343,7 @@ &lt;/span&gt;&lt;span class="cx"&gt; currentDragBox = None &lt;/span&gt;&lt;span class="rem"&gt;- primaryCollection = self.blockItem.contents.collectionList[0] &lt;/span&gt;&lt;span class="add"&gt;+ primaryCollection = self.blockItem.contentsCollection &lt;/span&gt;&lt;span class="cx"&gt; # First generate a sorted list of Time</span><span class="rem">- if sharingView is None: - sharingView = self.itsView </span><span class="add">+ if not self.exists(): + raise NotFound(_(u&quot;%(location)s does not exist&quot;) % + {'location': location}) </span><span class="cx"> </span><span class="rem">- else: - # Make sure our version is as it was at last sync - version = self.marker.getVersion() - sharingView.itsVersion = version </span><span class="add">+ self.resourceList = self._getResourceList(location) </span><span class="cx"> </span><span class="rem">- # &quot;self&quot; is an object in the main view; we need a reference to self - # that is in the sharing view: - sharingSelf = sharingView[self.itsUUID] - - location = sharingSelf.getLocation() - logger.info(&quot;Starting GET of %s&quot; % (location)) - - if not sharingSelf.exists(): - raise NotFound(_(u&quot;%(location)s does not exist&quot;) % {'location': location}) - - sharingSelf.resourceList = sharingSelf._getResourceList(location) - </span><span class="cx"> logger.debug(_(u&quot;Resources on server: %(resources)s&quot;) % \ </span><span class="rem">- {'resources':sharingSelf.resourceList}) </span><span class="add">+ {'resources':self.resourceList}) </span><span class="cx"> logger.debug(_(u&quot;Manifest: %(manifest)s&quot;) % \ </span><span class="rem">- {'manifest':sharingSelf.manifest}) </span><span class="add">+ {'manifest':self.manifest}) </span><span class="cx"> # We need to keep track of which items we'veosafoundation.org/mailman/listinfo/chandler-users_______________________________________________chandler-usersmailinglistchandler-users@osafoundation.orghttp://lists.osafoundation.org/mailman/listinfo/chandler-users</pre> Tue, 28 Oct, 00:35
Message list1 · 2 · Next »Thread · Author · Date
Box list
Mar 201010
Feb 201094
Jan 201049
Dec 200927
Nov 200945
Oct 200958
Sep 200950
Aug 200949
Jul 200984
Jun 200959
May 2009159
Apr 2009117
Mar 2009153
Feb 2009131
Jan 2009191
Dec 2008220
Nov 2008168
Oct 2008195
Sep 2008302
Aug 2008354
Jul 2008283
Jun 2008175
May 2008196
Apr 2008134
Mar 2008168
Feb 2008166
Jan 2008152
Dec 200797
Nov 2007144
Oct 2007187
Sep 2007144
Aug 2007101
Jul 200728
Jun 200775
May 200730
Apr 200793
Mar 200795
Feb 200746
Jan 200723