Skip to content

Commit

Permalink
SAK-6361 Removed check for hiding the checkbox.
Browse files Browse the repository at this point in the history
hiddenLock is not referenced anywhere in PermissionHelperAction so will always be empty.
editViewRoster is never setup in PermissionHelperAction so will always be empty.
The permissions helper never gets called for the site prefix so I'm dropping the check on site.vireRoster as well.

The hidden checkbox would also have broken realms where the permission came in through an additional realm.

git-svn-id: https://source.sakaiproject.org/svn/authz/branches/SAK-6361@123027 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
buckett committed Apr 19, 2013
1 parent a6478d4 commit fbc9612
Showing 1 changed file with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,13 @@
#set($roleAbilities = $rolesAbilities.get($role.Id))
#set($roleCount=$roleCount + 1)
<td class="$roleCount checkboxCell">
#if (($!hiddenLock.size()>0 && $!hiddenLock.indexOf($lock) != -1) || ($lock == "site.viewRoster" && !$!editViewRoster))
## don't show checkbox for those roles
#if($roleAbilities.contains($lock))
<img src="#imageLink("sakai/checkon.gif")" border="0" alt="$thelp.getString("per.alrgra")" hspace="5" />
#else
#if($roleAbilities.contains($lock))
<img src="#imageLink("sakai/checkon.gif")" border="0" alt="$thelp.getString("per.alrgra")" hspace="5" />
#else
<label for="$role.Id$lock"> <span class="skip">$thelp.getString("gen.enable") $role.Id: $desc</span>
<input class="$role.Id$lock" type="checkbox" name="$role.Id$lock" id="$role.Id$lock" value="$role.Id$lock" #if(($myRole) && ($myRole.Id==$role.Id) && ($myRole.AllowedFunctions.contains($lock)))checked="checked"#end />
</label>
#end
#end
#end
</td>
#end
Expand Down

0 comments on commit fbc9612

Please sign in to comment.