[JENKINS-14494] use ${it} instead of Stapler.getCurrentRequest().find…

…AncestorObject()
jenkinsci · Aug 22, 2013 · 99e2d37 · 99e2d37
1 parent 22d147c
commit 99e2d37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java b/src/main/java/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher.java
@@ -160,10 +160,8 @@ public Descriptor<? extends BuildStep> getDefaultPublisher() {
             return Hudson.getInstance().getDescriptorByType(ArtifactArchiver.DescriptorImpl.class);
         }
 
-        public boolean isMatrixProject() {
-            // Determine the configuring project from the request url.
-            AbstractProject<?,?> project = Stapler.getCurrentRequest().findAncestorObject(AbstractProject.class);
-            return (project instanceof MatrixProject);
+        public boolean isMatrixProject(Object it) {
+            return (it instanceof MatrixProject);
         }
     }
 

diff --git a/src/main/resources/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher/config.jelly b/src/main/resources/org/jenkins_ci/plugins/flexible_publish/ConditionalPublisher/config.jelly
@@ -40,7 +40,7 @@
                 default="${descriptor.defaultBuildStepRunner}"/>
     </f:entry>
     </f:advanced>
-    <j:if test="${descriptor.matrixProject}">
+    <j:if test="${descriptor.isMatrixProject(it)}">
       <f:optionalBlock inline="true" field="configuredAggregation" title="${%configureForParent}" checked="${instance.configuredForMatrixParent}">
         <f:entry>
           <f:dropdownDescriptorSelector title="${%runConditionForParent}" field="aggregationCondition" descriptors="${descriptor.runConditions}"