diff options
author | flop25 <flop25@piwigo.org> | 2012-01-02 15:55:47 +0000 |
---|---|---|
committer | flop25 <flop25@piwigo.org> | 2012-01-02 15:55:47 +0000 |
commit | 9e95ed515d8b05072f49e9d216317a1d691d3b60 (patch) | |
tree | f158a08cdf9f0e2eb81a6be3ff5e967ae448eeb5 | |
parent | 97a0c973fd73c2727679c257c6199485f89f9ac5 (diff) |
checkbox "apply on sub" after the button
better "if isset" to avoid errors if no user have been selected
git-svn-id: http://piwigo.org/svn/trunk@12825 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r-- | admin/cat_perm.php | 4 | ||||
-rw-r--r-- | admin/themes/default/template/cat_perm.tpl | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/admin/cat_perm.php b/admin/cat_perm.php index c6e26462a..f2dbb3b4a 100644 --- a/admin/cat_perm.php +++ b/admin/cat_perm.php @@ -148,7 +148,9 @@ DELETE ;'; pwg_query($query); } -else if (isset($_POST['grant_users_submit'])) +else if (isset($_POST['grant_users_submit']) + and isset($_POST['grant_users']) + and count($_POST['grant_users']) > 0) { add_permission_on_category($page['cat'], $_POST['grant_users']); } diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl index 03a2822d9..4e1a202a0 100644 --- a/admin/themes/default/template/cat_perm.tpl +++ b/admin/themes/default/template/cat_perm.tpl @@ -25,8 +25,8 @@ <li><label><input type="checkbox" name="grant_groups[]" value="{$id}"> {$all_groups[$id]}</label></li> {/foreach} </ul> - <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label> <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}"> + <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label> </fieldset> <h4>{'Users'|@translate}</h4> @@ -59,8 +59,8 @@ <li><label><input type="checkbox" name="grant_users[]" value="{$id}"> {$all_users[$id]}</label></li> {/foreach} </ul> - <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label> <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}"> + <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label> </fieldset> <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> |