diff --git a/src/main/rdplugin/assets/js/jobgraph.js b/src/main/rdplugin/assets/js/jobgraph.js index 7e87a7c..39e17d3 100644 --- a/src/main/rdplugin/assets/js/jobgraph.js +++ b/src/main/rdplugin/assets/js/jobgraph.js @@ -308,6 +308,7 @@ jQuery(function () { function JobDataLoader() { var self = this; + var apiBase = window._rundeck.rdBase + '/api/' + window._rundeck.apiVersion; self.jobdata = {}; self.undefjobs = {}; self.undef = 0; @@ -417,9 +418,7 @@ jQuery(function () { self.load = function (id) { return jQuery.ajax({ - url: _genUrl(appLinks.scheduledExecutionWorkflowJson, { - id: id - }), + url: apiBase + "/job/" + id + "/workflow", method: 'GET', contentType: 'json' // success:function(data){ } @@ -427,18 +426,13 @@ jQuery(function () { }; self.find = function (group, name) { return jQuery.ajax({ - url: _genUrl(appLinks.menuJobsAjax, { - project: project, - jobExactFilter: name, - groupPathExact: group - }), + url: apiBase + "/" + project + "/jobs?jobExactFilter=" + name + "&groupPathExact=" + group, method: 'GET', contentType: 'json' // success:function(data){ } }); }; - } function loadJobShowPageData() {