From 4573ada534720a44109e200172e48207140d5865 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 31 Dec 2008 19:59:42 +0000
Subject: Extend permissions interface to allow resetting to the parental
 default.

---
 core/views/permissions_form.html.php | 41 ++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

(limited to 'core/views/permissions_form.html.php')

diff --git a/core/views/permissions_form.html.php b/core/views/permissions_form.html.php
index 80fbedf6..d0b605e2 100644
--- a/core/views/permissions_form.html.php
+++ b/core/views/permissions_form.html.php
@@ -15,20 +15,35 @@
       <td> <?= _($permission->display_name) ?> </td>
       <? foreach ($groups as $group): ?>
       <td>
-        <? $locked = access::locking_items($group, $permission->name, $item) ?>
+        <? $intent = access::group_intent($group, $permission->name, $item) ?>
         <? $allowed = access::group_can($group, $permission->name, $item) ?>
-        <? if ($locked && $allowed): ?>
-        allowed <a href="#">locked</a>
-        <? elseif ($locked && !$allowed): ?>
-        denied <a href="#">locked</a>
-        <? elseif ($allowed): ?>
-        <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">
-          <?= _("allowed") ?>
-        </a>
-        <? elseif (!$allowed): ?>
-        <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">
-          <?= _("denied") ?>
-        </a>
+        <? $lock = access::locked_by($group, $permission->name, $item) ?>
+
+        <? if ($lock): ?>
+
+        <? if ($allowed): ?>
+        allowed
+        <? else: ?>
+        denied
+        <? endif ?>
+
+        <a href="javascript:show(<?= $lock->id ?>)">(parental lock)</a>
+        <? else: ?>
+
+        <? if ($allowed): ?>
+        <a href="javascript:set('deny',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">allowed</a>
+        <? else: ?>
+        <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">denied</a>
+        <? endif ?>
+
+        <? if ($intent === null): ?>
+        (from parent)
+        <? else: ?>
+        <? if ($item->id != 1): ?>
+        <a href="javascript:set('reset',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)">(reset to parent)</a>
+        <? endif ?>
+        <? endif ?>
+
         <? endif ?>
       </td>
       <? endforeach ?>
-- 
cgit v1.2.3