Show system calendars in shared section for non-admins.

horde · Apr 22, 2015 · b593763 · b593763
1 parent 0e5a86f
commit b593763
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
@@ -1080,7 +1080,9 @@ KronolithCore = {
     {
         switch (type) {
         case 'system':
-            return $('kronolithSystemCalendars');
+            return $('kronolithSystemCalendars')
+                ? $('kronolithSystemCalendars')
+                : $('kronolithSharedCalendars');
         case 'internal':
             return personal
                 ? $('kronolithMyCalendars')

diff --git a/kronolith/lib/View/Sidebar.php b/kronolith/lib/View/Sidebar.php
@@ -58,6 +58,7 @@ public function __construct($config = array())
         /* Calendars. */
         $sidebar->newShares = $registry->getAuth() &&
             !$prefs->isLocked('default_share');
+        $sidebar->admin = $registry->isAdmin();
         $sidebar->resourceAdmin = $registry->isAdmin() || $GLOBALS['injector']->getInstance('Horde_Core_Perms')->hasAppPermission('resource_management');
         $sidebar->resources = $GLOBALS['conf']['resources']['enabled'];
 

diff --git a/kronolith/templates/dynamic/sidebar.html.php b/kronolith/templates/dynamic/sidebar.html.php
@@ -51,6 +51,7 @@
       </div>
       <?php endif; ?>
 
+      <?php if ($this->admin): ?>
       <div class="horde-sidebar-split"></div>
       <div>
         <h3>
@@ -62,6 +63,7 @@
           <div id="kronolithSystemCalendars" class="horde-resources"></div>
         </div>
       </div>
+      <?php endif ?>
 
       <div class="horde-sidebar-split"></div>
       <div>