From a49032a6bd9b49bfecc610c68d8fdc5fc3871251 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 15 Jun 2015 12:03:38 -0400
Subject: [PATCH] (fix) show only the URL of web calendars, when asked

---
 UI/Scheduler/UIxCalendarFolderLinksTemplate.m | 13 ++++
 .../UIxCalendarFolderLinksTemplate.wox        | 67 +++++++++++--------
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/UI/Scheduler/UIxCalendarFolderLinksTemplate.m b/UI/Scheduler/UIxCalendarFolderLinksTemplate.m
index c76a5fe3e..d8ae5ec48 100644
--- a/UI/Scheduler/UIxCalendarFolderLinksTemplate.m
+++ b/UI/Scheduler/UIxCalendarFolderLinksTemplate.m
@@ -18,8 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSURL.h>
+
 #import <SOGo/SOGoSystemDefaults.h>
 #import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoWebAppointmentFolder.h>
 
 #import "UIxCalendarFolderLinksTemplate.h"
 
@@ -115,4 +118,14 @@
            enablePublicAccess];
 }
 
+- (BOOL) isWebCalendar
+{
+  return ([calendar isKindOfClass: [SOGoWebAppointmentFolder class]]);
+}
+
+- (NSString *) webCalendarURL
+{
+  return [calendar folderPropertyValueInCategory: @"WebCalendars"];
+}
+
 @end
diff --git a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
index 2fe99dcf4..48c9e5aab 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
@@ -12,40 +12,51 @@
       <div  layout="column" layout-padding="layout-padding">
 
         <div layout="column" layout-padding="layout-padding">
-          <span><var:string label:value="Authenticated User Access"/></span>
-          
-          <md-input-container>
-            <label><var:string label:value="CalDAV URL"/></label>
-            <input var:value="calDavURL" ng-readonly="true"/>
-          </md-input-container>
-          <md-input-container>
-            <label><var:string label:value="WebDAV ICS URL"/></label>
-            <input var:value="webDavICSURL" ng-readonly="true"/>
-          </md-input-container>
-          <md-input-container>
-            <label><var:string label:value="WebDAV XML URL"/></label>
-            <input var:value="webDavXMLURL" ng-readonly="true"/>
-          </md-input-container>
+
+          <var:if condition="isWebCalendar">
+            <md-input-container>
+              <label><var:string label:value="URL:"/></label>
+              <input var:value="webCalendarURL" ng-readonly="true"/>
+            </md-input-container>
+          </var:if>
+          <var:if condition="isWebCalendar" const:negate="YES">
+            <span><var:string label:value="Authenticated User Access"/></span>
+            
+            <md-input-container>
+              <label><var:string label:value="CalDAV URL"/></label>
+              <input var:value="calDavURL" ng-readonly="true"/>
+            </md-input-container>
+            <md-input-container>
+              <label><var:string label:value="WebDAV ICS URL"/></label>
+              <input var:value="webDavICSURL" ng-readonly="true"/>
+            </md-input-container>
+            <md-input-container>
+              <label><var:string label:value="WebDAV XML URL"/></label>
+              <input var:value="webDavXMLURL" ng-readonly="true"/>
+            </md-input-container>
+          </var:if>
         </div>
 
         
         <var:if condition="isPublicAccessEnabled">
-          <div layout="column" layout-padding="layout-padding">
-            <span><var:string label:value="Public Access"/></span>
-
+          <var:if condition="isWebCalendar" const:negate="YES">
+            <div layout="column" layout-padding="layout-padding">
+              <span><var:string label:value="Public Access"/></span>
+              
+              <md-input-container>
+                <label><var:string label:value="CalDAV URL: "/></label>
+                <input var:value="publicCalDavURL" ng-readonly="true"/>
+              </md-input-container>
+            </div>
             <md-input-container>
-              <label><var:string label:value="CalDAV URL: "/></label>
-              <input var:value="publicCalDavURL" ng-readonly="true"/>
+              <label><var:string label:value="WebDAV ICS URL"/></label>
+              <input var:value="publicWebDavICSURL" ng-readonly="true"/>
             </md-input-container>
-          </div>
-          <md-input-container>
-            <label><var:string label:value="WebDAV ICS URL"/></label>
-            <input var:value="publicWebDavICSURL" ng-readonly="true"/>
-          </md-input-container>
-          <md-input-container>
-            <label><var:string label:value="WebDAV XML URL"/></label>
-            <input var:value="publicWebDavXMLURL" ng-readonly="true"/>
-          </md-input-container>
+            <md-input-container>
+              <label><var:string label:value="WebDAV XML URL"/></label>
+              <input var:value="publicWebDavXMLURL" ng-readonly="true"/>
+            </md-input-container>
+          </var:if>
         </var:if>
       </div>