merge of '819ae78a7b35f2cf4b307d16a3b0da9a2d5b767c'

and 'a79ba19dc901642223410e1cd56c639ec05a6098'

Monotone-Parent: 819ae78a7b35f2cf4b307d16a3b0da9a2d5b767c
Monotone-Parent: a79ba19dc901642223410e1cd56c639ec05a6098
Monotone-Revision: a8d7706d1697aa0016456102e8d0198a8f7ef74d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-15T19:51:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-11-15 19:51:13 +00:00
3 changed files with 16 additions and 4 deletions
+6 -2
View File
@@ -375,7 +375,9 @@
if ([co isNew])
{
if (componentCalendar && componentCalendar != previousCalendar)
if (componentCalendar
&& ![[componentCalendar ocsPath]
isEqualToString: [previousCalendar ocsPath]])
{
// New event in a different calendar -- make sure the user can
// write to the selected calendar since the rights were verified
@@ -397,7 +399,9 @@
// The event was modified -- save it.
[co saveComponent: event];
if (componentCalendar && componentCalendar != previousCalendar)
if (componentCalendar
&& ![[componentCalendar ocsPath]
isEqualToString: [previousCalendar ocsPath]])
{
// The event was moved to a different calendar.
if (![sm validatePermission: SoPerm_DeleteObjects