Changeset 12826


Ignore:
Timestamp:
Jan 2, 2012, 5:41:18 PM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.3/admin/cat_perm.php

    r12020 r12826  
    149149  pwg_query($query);
    150150}
    151 else if (isset($_POST['grant_users_submit']))
     151else if (isset($_POST['grant_users_submit'])
     152         and isset($_POST['grant_users'])
     153         and count($_POST['grant_users']) > 0)
    152154{
    153155  add_permission_on_category($page['cat'], $_POST['grant_users']);
  • branches/2.3/admin/themes/default/template/cat_perm.tpl

    r12020 r12826  
    2626      {/foreach}
    2727    </ul>
     28    <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}">
    2829    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
    29     <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}">
    3030  </fieldset>
    3131
     
    6060      {/foreach}
    6161    </ul>
     62    <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}">
    6263    <label><input type="checkbox" name="apply_on_sub">{'Apply to sub-albums'|@translate}</label>
    63     <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}">
    64   </fieldset>
     64 </fieldset>
    6565
    6666<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
Note: See TracChangeset for help on using the changeset viewer.