From 819851bb92d927875c0ef5e98794dbfb60d9d051 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 10 Mar 2016 09:18:39 -0500
Subject: [PATCH] (js) Respect super user creation privilege

---
 NEWS                                                   | 1 +
 UI/Templates/ContactsUI/UIxContactFoldersView.wox      | 2 +-
 UI/WebServerResources/js/Scheduler/Calendar.service.js | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a78291f10..074d25fcd 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Bug fixes
  - [web] fixed missing columns in SELECT statements (PostgreSQL)
  - [web] fixed display of ghosts when dragging events
  - [web] fixed management of mail labels in Preferences module
+ - [web] respect super user privileges to create in any calendar and addressbook
 
 3.0.2 (2016-03-04)
 ------------------
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index a74a26f37..311d2a5a5 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -426,7 +426,7 @@
           </div>
           <md-button class="md-fab md-fab-bottom-right md-accent"
                      label:aria-label="New Contact"
-                     ng-show="addressbook.selectedFolder.acls.objectCreator"
+                     ng-show="addressbook.selectedFolder.isOwned || addressbook.selectedFolder.acls.objectCreator"
                      ng-click="addressbook.newComponent($event)">
             <md-icon>add</md-icon>
           </md-button>
diff --git a/UI/WebServerResources/js/Scheduler/Calendar.service.js b/UI/WebServerResources/js/Scheduler/Calendar.service.js
index 2ac9d2aa7..02f6dbb7e 100644
--- a/UI/WebServerResources/js/Scheduler/Calendar.service.js
+++ b/UI/WebServerResources/js/Scheduler/Calendar.service.js
@@ -135,7 +135,9 @@
     }
 
     if (writable) {
-      return _.union(this.$calendars, _.filter(this.$subscriptions, function(calendar) { return calendar.acls.objectCreator; }));
+      return _.union(this.$calendars, _.filter(this.$subscriptions, function(calendar) {
+        return calendar.isOwned || calendar.acls.objectCreator;
+      }));
     }
 
     return _.union(this.$calendars, this.$subscriptions, this.$webcalendars);