root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[JENKINS-71052] CSP compatibility: SetupWizard/wizard-ui.jelly (#8211) 

Co-authored-by: niralmaruda <85137760+niralmaruda@users.noreply.github.com>
Co-authored-by: Niral Maruda <niralmaruda@gmail.com>
Co-authored-by: Yaroslav Afenkin <yaroslavafenkin@users.noreply.github.com>
This commit is contained in:
Yaroslav 2023-07-29 17:37:55 +03:00 committed by GitHub
parent 1a410e9fa4
commit 3b83252af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/resources/jenkins/install/SetupWizard/_wizard-ui.js Normal file
View File

@ -0,0 +1,12 @@
// all variables declared here have to be in global scope
window.defaultUpdateSiteId = (function () {
var defaultSiteId = document
.querySelector("#default-site-id")
.getAttribute("data-default-update-site-id");
return defaultSiteId ? defaultSiteId.replace("'", "") : "default";
})();
window.setupWizardExtensions = [];
window.onSetupWizardInitialized = function (extension) {
setupWizardExtensions.push(extension);
};

10
core/src/main/resources/jenkins/install/SetupWizard/wizard-ui.jelly
View File

@ -1,13 +1,7 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
<script type="text/javascript">
<j:getStatic var="defaultUpdateSiteId" className="hudson.model.UpdateCenter" field="ID_DEFAULT"/>
var defaultUpdateSiteId = '${defaultUpdateSiteId ? defaultUpdateSiteId.replace("'", "") : "default"}';
var setupWizardExtensions = [];
var onSetupWizardInitialized = function(extension) {
setupWizardExtensions.push(extension);
};
</script>
<div id="default-site-id" data-default-update-site-id="${hudson.model.UpdateCenter.ID_DEFAULT}"/>
<st:adjunct includes="jenkins.install.SetupWizard._wizard-ui"/>
<j:forEach var="setupExtension" items="${app.setupWizard.installStates}">
<st:include it="${setupExtension}" page="client-scripts" optional="true" />
</j:forEach>