Merge pull request #4808 from rundeck/issue/4804

Fix #4804 broken node config page with web context path
rundeck · May 10, 2019 · 9713d07 · 9713d07
2 parents 2fe1ff3 + a3bc885
commit 9713d07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/rundeckapp/grails-spa/package.json b/rundeckapp/grails-spa/package.json
@@ -28,7 +28,7 @@
     "vuex": "^3.1.0"
   },
   "devDependencies": {
-    "@rundeck/ui-trellis": "git+https://github.com/rundeck/ui-trellis.git",
+    "@rundeck/ui-trellis": "git+https://github.com/rundeck/ui-trellis.git#034f4ba1b5598f6135b690d583269d21ab887c7f",
     "@types/lodash": "^4.14.117",
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",

diff --git a/rundeckapp/grails-spa/src/pages/project-nodes-config/ProjectPluginConfig.vue b/rundeckapp/grails-spa/src/pages/project-nodes-config/ProjectPluginConfig.vue
@@ -315,7 +315,8 @@ export default Vue.extend({
         const serializedData=data.map(this.serializeConfigEntry)
 
         const resp = await this.rundeckContext.rundeckClient.sendRequest({
-          url: `/framework/saveProjectPluginsAjax`,
+          pathTemplate: `/framework/saveProjectPluginsAjax`,
+          baseUrl:this.rdBase,
           method: 'POST',
           queryParameters: {
                 project: `${window._rundeck.projectName}`,

diff --git a/rundeckapp/grails-spa/src/pages/project-nodes-config/nodeSourcesUtil.ts b/rundeckapp/grails-spa/src/pages/project-nodes-config/nodeSourcesUtil.ts
@@ -23,7 +23,9 @@ export async function getProjectNodeSources(): Promise<NodeSource[]> {
 
   const rundeckContext = getRundeckContext()
   const resp = await client.sendRequest({
-    url: `/api/${rundeckContext.apiVersion}/project/${rundeckContext.projectName}/sources`,
+    pathTemplate: '/api/{apiVersion}/project/{projectName}/sources',
+    pathParameters: rundeckContext,
+    baseUrl: rundeckContext.rdBase,
     method: 'GET'
   })
   if (!resp.parsedBody) {