Changeset 12826 for branches

Timestamp:

Jan 2, 2012, 5:41:18 PM (12 years ago)

Author:

flop25

Message:

merge r12825 from trunk to branch 2.3 bug:2546 fixed:
checkbox "apply on sub" after the button
better "if isset" to avoid errors if no user have been selected

Location:

branches/2.3/admin

Files:

• cat_perm.php (modified) (1 diff)
• themes/default/template/cat_perm.tpl (modified) (2 diffs)

branches/2.3/admin/cat_perm.php

@@ -149 +149 @@
   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']);

branches/2.3/admin/themes/default/template/cat_perm.tpl

@@ -26 +26 @@
       {/foreach}
     </ul>
+    <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>
-    <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}">
   </fieldset>
 
@@ -60 +60 @@
       {/foreach}
     </ul>
+    <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>
-    <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}">
-  </fieldset>
+ </fieldset>
 
 <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">