inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
57915: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57908: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57900: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57890: Merged DEV to V4.1.7 (4.1.7)
               57718:  MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                  - Implemented the functionality that allow updating series in outlook calendar.
               57846: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                 - Unit tests and unforeseen behaviour (deletion of updated occurrence; update of recurrence, when occurrence was deleted) were implemented. Also, mini calendar dashlet was updated.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 22:28:24 +00:00
parent c9e8436ebf
commit 8fecf5f0fc
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/service/cmr/calendar/CalendarTimezoneHelper.java
View File

@@ -321,7 +321,7 @@ public class CalendarTimezoneHelper
for (String extra : extras)
{
splitAt = extra.indexOf('=');
if (splitAt > -1)
if (splitAt > -1 && !result.containsKey(mainKey+"-"+extra.substring(0,splitAt-1)))
{
result.put(mainKey+"-"+extra.substring(0,splitAt-1), extra.substring(splitAt+1));
}
@@ -336,16 +336,21 @@ public class CalendarTimezoneHelper
keyValue[0] = keyValue[0] + attendeeNum;
attendeeNum++;
}
result.put(keyValue[0], keyValue[keyValue.length - 1]);
if (!result.containsKey(keyValue[0]))
{
result.put(keyValue[0], keyValue[keyValue.length - 1]);
}
}
if (!stack.isEmpty() && stack.peek().equals(ICAL_SECTION_TIMEZONE))
if (!stack.isEmpty() && stack.peek().equals(ICAL_SECTION_TIMEZONE) && !result.containsKey("TZ-" + keyValue[0]))
{
// Store the top level timezone details with a TZ prefix
result.put("TZ-"+keyValue[0], keyValue[keyValue.length-1]);
}
if (stack.size() >= 2 && stack.get(stack.size()-2).equals(ICAL_SECTION_TIMEZONE) &&
(stack.peek().equals(ICAL_SECTION_TZ_STANDARD) || stack.peek().equals(ICAL_SECTION_TZ_DAYLIGHT)) )
(stack.peek().equals(ICAL_SECTION_TZ_STANDARD) || stack.peek().equals(ICAL_SECTION_TZ_DAYLIGHT)) &&
!result.containsKey("TZ-"+stack.peek()+"-"+keyValue[0]))
{
// Store the timezone details with a TZ prefix + details type
result.put("TZ-"+stack.peek()+"-"+keyValue[0], keyValue[keyValue.length-1]);