From 2b27745a00d0c5ad8974754c2f9778f4039704d5 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 2 Oct 2019 09:15:25 -0400
Subject: [PATCH] Allow import to writable calendar subscriptions

---
 NEWS                                        | 1 +
 UI/Scheduler/UIxCalendarSelector.m          | 5 ++---
 UI/Templates/SchedulerUI/UIxCalMainView.wox | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index a049c3f62..5cf1ae392 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Bug fixes
  - [web] restore cards selection after automatic refresh (#4809)
  - [web] don't mark draft as deleted when SOGoMailKeepDraftsAfterSend is enabled (#4830)
  - [web] allow single-day vacation auto-reply (#4698)
+ - [web] allow import to calendar subscriptions with creation rights
  - [core] honor IMAPLoginFieldName also when setting IMAP ACLs
  - [core] honor groups when setting IMAP ACLs
  - [core] honor "any authenticated user" when setting IMAP ACLs
diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index 1cd408e4c..ffeab913b 100644
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -197,15 +197,14 @@ _intValueFromHex (NSString *hexString)
           allACLs = ([owner isEqualToString: userLogin] ? nil : [folder aclsForUser: userLogin]);
           objectCreator = ([owner isEqualToString: userLogin] || [allACLs containsObject: SOGoRole_ObjectCreator]);
           objectEraser = ([owner isEqualToString: userLogin] || [allACLs containsObject: SOGoRole_ObjectEraser]);
-          acls = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool: objectCreator], @"objectCreator",
-                                   [NSNumber numberWithBool: objectEraser], @"objectEraser", nil];
-
 
           if ([folder isKindOfClass: [SOGoWebAppointmentFolder class]])
             objectCreator = objectEraser = synchronize = NO;
           else
             synchronize = [folder synchronize];
 
+          acls = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool: objectCreator], @"objectCreator",
+                                   [NSNumber numberWithBool: objectEraser], @"objectEraser", nil];
           [calendar setObject: acls  forKey: @"acls"];
 
           if ([[folder nameInContainer] isEqualToString: @"personal"])
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 7ddd00230..d7045dcca 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -547,7 +547,7 @@
             ng-hide="::($menuCtrl.calendar.isSubscription || $menuCtrl.calendar.isWebCalendar)">
           <!-- divider -->
         </md-menu-divider>
-        <md-menu-item ng-hide="::($menuCtrl.calendar.isSubscription || $menuCtrl.calendar.isWebCalendar)">
+        <md-menu-item ng-show="::$menuCtrl.calendar.acls.objectCreator">
           <md-button ng-click="$menuCtrl.importCalendar($event)">
             <var:string label:value="Import"/>
           </md-button>