Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit aac7d99

Browse files
committed
changed permission
1 parent dc2af93 commit aac7d99

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/main/java/com/mathworks/ci/MatlabBuilder.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* [email protected] Date : 28/03/2018 (Initial draft)
99
*/
1010

11+
import hudson.model.Item;
1112
import hudson.security.Permission;
1213
import java.io.File;
1314
import java.io.IOException;
@@ -20,6 +21,7 @@
2021
import javax.annotation.Nonnull;
2122
import org.apache.commons.io.FilenameUtils;
2223
import org.apache.commons.lang.ArrayUtils;
24+
import org.kohsuke.stapler.AncestorInPath;
2325
import org.kohsuke.stapler.DataBoundConstructor;
2426
import org.kohsuke.stapler.DataBoundSetter;
2527
import org.kohsuke.stapler.QueryParameter;
@@ -151,8 +153,11 @@ public DescriptorExtensionList<TestRunTypeList, Descriptor<TestRunTypeList>> get
151153
*/
152154

153155
@POST
154-
public FormValidation doCheckMatlabRoot(@QueryParameter String matlabRoot) {
155-
Jenkins.get().checkPermission(Permission.CONFIGURE);
156+
public FormValidation doCheckMatlabRoot(@QueryParameter String matlabRoot, @AncestorInPath Item item) {
157+
if (item == null) {
158+
return FormValidation.ok();
159+
}
160+
item.checkPermission(Item.CONFIGURE);
156161
setMatlabRoot(matlabRoot);
157162
List<Function<String, FormValidation>> listOfCheckMethods =
158163
new ArrayList<Function<String, FormValidation>>();

src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*
99
*/
1010

11+
import hudson.model.Item;
1112
import hudson.security.Permission;
1213
import java.io.File;
1314
import java.io.IOException;
@@ -19,6 +20,7 @@
1920
import hudson.matrix.MatrixProject;
2021
import hudson.model.Computer;
2122
import jenkins.model.Jenkins;
23+
import org.kohsuke.stapler.AncestorInPath;
2224
import org.kohsuke.stapler.DataBoundConstructor;
2325
import org.kohsuke.stapler.DataBoundSetter;
2426
import org.kohsuke.stapler.QueryParameter;
@@ -141,8 +143,11 @@ public String getMatlabAxisWarning() {
141143
* descriptor class.
142144
*/
143145
@POST
144-
public FormValidation doCheckMatlabRootFolder(@QueryParameter String matlabRootFolder) {
145-
Jenkins.get().checkPermission(Permission.CONFIGURE);
146+
public FormValidation doCheckMatlabRootFolder(@QueryParameter String matlabRootFolder, @AncestorInPath Item item) {
147+
if (item == null) {
148+
return FormValidation.ok();
149+
}
150+
item.checkPermission(Item.CONFIGURE);
146151
List<Function<String, FormValidation>> listOfCheckMethods =
147152
new ArrayList<Function<String, FormValidation>>();
148153
listOfCheckMethods.add(chkMatlabEmpty);

0 commit comments

Comments
 (0)