[FIX JENKINS-32506] Add impliedBy info to tooltip

jenkinsci · Sep 14, 2017 · 9764ed5 · 9764ed5
1 parent b53384b
commit 9764ed5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java b/src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
@@ -457,6 +457,23 @@ public boolean showPermission(Permission p) {
             return false;
         }
 
+        @Restricted(NoExternalUse.class)
+        public String getDescription(Permission p) {
+            String description = p.description.toString();
+            Permission impliedBy = p.impliedBy;
+            while (impliedBy != null && impliedBy.group == PermissionGroup.get(Permission.class)) {
+                if (impliedBy.impliedBy == null) {
+                    break;
+                }
+                impliedBy = impliedBy.impliedBy;
+            }
+            if (impliedBy != null && impliedBy != Jenkins.ADMINISTER) {
+                description += Messages.GlobalMatrixAuthorizationStrategy_PermissionImpliedBy(impliedBy.group.title, impliedBy.name);
+            }
+
+            return description;
+        }
+
         public FormValidation doCheckName(@QueryParameter String value ) throws IOException, ServletException {
             return doCheckName_(value, Jenkins.getInstance(), Jenkins.ADMINISTER);
         }

diff --git a/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly b/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly
@@ -81,7 +81,7 @@ THE SOFTWARE.
         <j:forEach var="g" items="${groups}">
           <j:forEach var="p" items="${g.permissions}">
             <j:if test="${descriptor.showPermission(p)}">
-              <th class="pane" tooltip="${p.description}">
+              <th class="pane" tooltip="${descriptor.getDescription(p)}">
                 ${p.name}
               </th>
             </j:if>

diff --git a/src/main/resources/org/jenkinsci/plugins/matrixauth/Messages.properties b/src/main/resources/org/jenkinsci/plugins/matrixauth/Messages.properties
@@ -22,3 +22,4 @@
 
 GlobalMatrixAuthorizationStrategy.DisplayName=Matrix-based security
 ProjectMatrixAuthorizationStrategy.DisplayName=Project-based Matrix Authorization Strategy
+GlobalMatrixAuthorizationStrategy.PermissionImpliedBy=<br/><br/>This permission is implied by {0}/{1}.