Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Groovy sandbox and support direct JSON input #24

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.19</version>
<version>1.48</version>
</dependency>
<dependency>
<groupId>io.fastjson</groupId>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">

<j:choose>
<j:when test="${it.hasUnapprovedScripts()}">
<div class="warning">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<j:set var="normalizedParameterName" value="${it.name.replace('.', '_')}"/>

<div id="editor_${it.name}_holder"> &amp;nbsp;</div>
<div id="editor_${it.name}_holder"></div>
<input id="editor_${it.name}_value" type="hidden" name="value" />

<j:set var="jsonEditorOptions" value="${it.getJSONEditorOptions()}"/>
Expand All @@ -33,11 +33,13 @@
(function() {
var mapping = {
html: '',
bootstrap2: '${resURL}/plugin/extended-choice-parameter/css/bootstrap.min.css',
bootstrap3: '${resURL}/plugin/extended-choice-parameter/css/bootstrap.min.css',
bootstrap2: '${resURL}/plugin/extended-choice-parameter/css/bootstrap2.min.css',
bootstrap3: '${resURL}/plugin/extended-choice-parameter/css/bootstrap3.min.css',
bootstrap4: '${resURL}/plugin/extended-choice-parameter/css/bootstrap4.min.css',
foundation3: '${resURL}/plugin/extended-choice-parameter/css/foundation3.css',
foundation4: '${resURL}/plugin/extended-choice-parameter/css/foundation4.css',
foundation5: '${resURL}/plugin/extended-choice-parameter/css/foundation5.css',
foundation6: '${resURL}/plugin/extended-choice-parameter/css/foundation6.css',
jqueryui: '${resURL}/plugin/extended-choice-parameter/css/jquery-ui.css'
};

Expand All @@ -51,8 +53,9 @@
var mapping = {
foundation2: '${resURL}/plugin/extended-choice-parameter/css/general_foundicons.css',
foundation3: '${resURL}/plugin/extended-choice-parameter/css/foundation-icons.css',
fontawesome3: '${resURL}/plugin/extended-choice-parameter/css/font-awesome3.css',
fontawesome4: '${resURL}/plugin/extended-choice-parameter/css/font-awesome4.css'
fontawesome3: '${resURL}/plugin/extended-choice-parameter/font-awesome3/css/font-awesome3.css',
fontawesome4: '${resURL}/plugin/extended-choice-parameter/font-awesome4/css/font-awesome4.css',
fontawesome5: '${resURL}/plugin/extended-choice-parameter/font-awesome5/css/font-awesome5.css'
};

document.getElementById('icon_stylesheet').href = mapping['${iconlib}'];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<script type="text/javascript" src="${resURL}/plugin/extended-choice-parameter/js/selectize.min.js"></script>
<script type="text/javascript" src="${resURL}/plugin/extended-choice-parameter/js/jsoneditor.min.js"></script>
<script type="text/javascript" src="${resURL}/plugin/extended-choice-parameter/js/jquery.jsonview.min.js"></script>

<link rel="stylesheet" href="${resURL}/plugin/extended-choice-parameter/css/jquery.jsonview.css" />
<link rel='stylesheet' id='icon_stylesheet' href="${resURL}/plugin/extended-choice-parameter/css/selectize.css"></link>
<link rel='stylesheet' id='icon_stylesheet' href="${resURL}/plugin/extended-choice-parameter/css/selectize.bootstrap2.css"></link>
<link rel='stylesheet' id='icon_stylesheet' href="${resURL}/plugin/extended-choice-parameter/css/selectize.bootstrap3.css"></link>
<link rel='stylesheet' id='theme_stylesheet'></link>
<link rel='stylesheet' id='icon_stylesheet'></link>
</j:jelly>
7 changes: 0 additions & 7 deletions src/main/webapp/css/bootstrap.min.css

This file was deleted.

9 changes: 9 additions & 0 deletions src/main/webapp/css/bootstrap2.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/main/webapp/css/bootstrap3.min.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions src/main/webapp/css/bootstrap4.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/webapp/css/foundation5.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/main/webapp/css/foundation6.css

Large diffs are not rendered by default.

Loading