Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #13 from jglick/AuthorizationMatrixProperty-View-J…
…ENKINS-28243

[JENKINS-28243] Fix display of permissions
  • Loading branch information
jglick committed May 6, 2015
2 parents fb215f3 + 91f9c76 commit 21d546a
Showing 1 changed file with 10 additions and 4 deletions.
Expand Up @@ -34,11 +34,10 @@
import hudson.Extension;
import hudson.model.AbstractProject;
import hudson.model.Hudson;
import hudson.model.Item;
import hudson.model.Run;
import hudson.security.GlobalMatrixAuthorizationStrategy;
import hudson.security.Permission;
import hudson.security.PermissionGroup;
import hudson.security.PermissionScope;
import hudson.security.ProjectMatrixAuthorizationStrategy;
import hudson.security.SidACL;
import hudson.util.FormValidation;
Expand All @@ -51,6 +50,7 @@

import javax.servlet.ServletException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -171,11 +171,17 @@ public String getDisplayName() {
}

public List<PermissionGroup> getAllGroups() {
return Arrays.asList(PermissionGroup.get(Item.class),PermissionGroup.get(Run.class));
List<PermissionGroup> groups = new ArrayList<PermissionGroup>();
for (PermissionGroup g : PermissionGroup.getAll()) {
if (g.hasPermissionContainedBy(PermissionScope.ITEM_GROUP)) {
groups.add(g);
}
}
return groups;
}

public boolean showPermission(Permission p) {
return p.getEnabled();
return p.getEnabled() && p.isContainedBy(PermissionScope.ITEM_GROUP);
}

public FormValidation doCheckName(@AncestorInPath Folder folder, @QueryParameter String value) throws IOException, ServletException {
Expand Down

0 comments on commit 21d546a

Please sign in to comment.