[jan] Always display system task lists to administrators.

horde · Jun 11, 2014 · 8e214db · 8e214db
1 parent 51efe6c
commit 8e214db
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.3.0-git
 ----------
 
+[jan] Always display system task lists to administrators.
 
 
 -----------

diff --git a/nag/lib/Application.php b/nag/lib/Application.php
@@ -148,6 +148,19 @@ public function sidebar($sidebar)
                 'label' => _("Create a new Task List"),
             );
         }
+        if ($GLOBALS['registry']->isAdmin()) {
+            $sidebar->containers['system'] = array(
+                'header' => array(
+                    'id' => 'nag-toggle-system',
+                    'label' => _("System Task Lists"),
+                    'collapsed' => true,
+                ),
+            );
+            $sidebar->containers['system']['header']['add'] = array(
+                'url' => Horde::url('tasklists/create.php')->add('system', 1),
+                'label' => _("Create a new System Task List"),
+            );
+        }
         $sidebar->containers['shared'] = array(
             'header' => array(
                 'id' => 'nag-toggle-shared',
@@ -170,7 +183,9 @@ public function sidebar($sidebar)
                 'edit' => $edit->add('t', $tasklist->getName()),
                 'type' => 'checkbox',
             );
-            if ($tasklist->get('owner') == $user) {
+            if (is_null($tasklist->get('owner'))) {
+                $sidebar->addRow($row, 'system');
+            } elseif ($tasklist->get('owner') == $user) {
                 $sidebar->addRow($row, 'my');
             } else {
                 $sidebar->addRow($row, 'shared');

diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
@@ -489,7 +489,12 @@ static public function listTasklists($owneronly = false,
                 array('perm' => $permission,
                       'attributes' => $att,
                       'sort_by' => 'name'));
-
+            if ($GLOBALS['registry']->isAdmin()) {
+                $tasklists = array_merge(
+                    $tasklists,
+                    $GLOBALS['nag_shares']->listSystemShares()
+                );
+            }
         } catch (Horde_Share_Exception $e) {
             Horde::log($e->getMessage(), 'ERR');
             return array();

diff --git a/nag/package.xml b/nag/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [jan] Always display system task lists to administrators.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1538,7 +1538,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [jan] Always display system task lists to administrators.
    </notes>
   </release>
  </changelog>