fix: https://github.com/jenkinsci/build-pipeline-plugin/blob/master/s…

…rc/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly\#L145
jenkinsci · Oct 30, 2024 · 6ef4240 · 6ef4240
1 parent 047a747
commit 6ef4240
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/.../hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js b/.../hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
@@ -5,6 +5,8 @@ let progressClickHandler = null;
 let successRerunHandler = null;
 let latestRerunHandler = null;
 let triggerBuildHandler = null;
+let triggerManualBuildLatestHandler = null;
+let triggerManualBuildHandler = null;
 
 // Common utilities
 const parseDataAttributes = (container) => ({
@@ -152,19 +154,33 @@ Behaviour.specify(
 );
 
 Behaviour.specify(
-    ".bct-trigger-build-onclick",
+    ".bct-trigger-manual-build-latest-onclick",
     'BuildCardExtension_triggerBuildClick',
     0,
     function() {
         triggerBuildHandler = createDelegatedHandler(
             '.pipelines',
-            '.bct-trigger-build-onclick',
+            '.bct-trigger-manual-build-latest-onclick',
             handleTriggerBuild,
             triggerBuildHandler
         );
     }
 );
 
+Behaviour.specify(
+    ".bct-trigger-manual-build-onclick",
+    'BuildCardExtension_triggerManualBuildClick',
+    0,
+    function() {
+        triggerManualBuildHandler = createDelegatedHandler(
+            '.pipelines',
+            '.bct-trigger-manual-build-onclick',
+            handleTriggerBuild,
+            triggerManualBuildHandler
+        );
+    }
+);
+
 //
 // Behaviour.specify(".bct-progress-console-onclick", 'BuildCardExtension_progressBarClick', 0, function (element) {
 //

diff --git a/...msystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly b/...msystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
@@ -146,14 +146,16 @@
             {{#if build.isReadyToBeManuallyBuilt}}
                 {{#if ${it.triggerOnlyLatestJob}}}
                     {{#if build.isUpstreamBuildLatestSuccess}}
-                    <span class="bct-trigger-build-onclick-params" data-show-spinner-id="{{id}}" data-upstream-project-name="{{upstream.projectName}}" data-upstream-build-number="{{upstream.buildNumber}}" data-project-name="{{project.name}}" data-dependency-ids="{{build.dependencyIds}}" style="display: none;" />
-                    <span class="bct-trigger-build-onclick">
+                    <span class="bct-trigger-manual-build-latest-onclick-params" data-show-spinner-id="{{id}}" data-upstream-project-name="{{upstream.projectName}}" data-upstream-build-number="{{upstream.buildNumber}}" data-project-name="{{project.name}}" data-dependency-ids="{{build.dependencyIds}}" style="display: none;" />
+                    <span class="bct-trigger-manual-build-latest-onclick">
                         <l:icon src="icon-clock icon-sm" alt="trigger" />
                     </span>
                     <h1>test5</h1>
                     {{/if}}
                 {{else}}
-                <span onclick="buildPipeline.showSpinner({{id}}); buildPipeline.triggerBuild({{id}}, '{{upstream.projectName}}', {{upstream.buildNumber}}, '{{project.name}}', [{{build.dependencyIds}}])">
+
+                <span class="bct-trigger-manual-build-onclick-params" data-show-spinner-id="{{id}}" data-upstream-project-name="{{upstream.projectName}}" data-upstream-build-number="{{upstream.buildNumber}}" data-project-name="{{project.name}}" data-dependency-ids="{{build.dependencyIds}}" style="display: none;" />
+                <span class="bct-trigger-manual-build-onclick">
                     <l:icon src="icon-clock icon-sm" alt="trigger" />
                 </span>
                 <h1>test6</h1>