Merge pull request #67 from tfennelly/sandbox-defaulting

[JENKINS-25784] Defaulting of sandbox mode based on RUN_SCRIPT privs
jenkinsci · Mar 4, 2015 · 36cd989 · 36cd989
2 parents 927d9a3 + 24a2998
commit 36cd989
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/config.jelly
@@ -28,7 +28,7 @@
     <f:textarea checkMethod="post"/>
   </f:entry>
   <f:entry field="sandbox">
-    <f:checkbox title="${%Use Groovy Sandbox}"/>
+    <f:checkbox title="${%Use Groovy Sandbox}" default="${!h.hasPermission(app.RUN_SCRIPTS)}" />
   </f:entry>
   <st:include it="${descriptor.snippetizer}" page="block.jelly"/>
 </j:jelly>
diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>script-security</artifactId>
-                <version>1.12</version>
+                <version>1.13</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>