Fix "add job" vendor/API path when basePath is set

JensVanhooydonck · Feb 27, 2019 · c847655 · c847655
1 parent 47fe774
commit c847655
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/public/dashboard.js b/public/dashboard.js
@@ -135,13 +135,13 @@ $(document).ready(() => {
     const data = localStorage.getItem('arena:savedJobData') || '{ id: \'\' }';
     window.jsonEditor.set(JSON.parse(data));
   });
-  
+
   $('.js-add-job').on('click', function() {
     const data = window.jsonEditor.get();
     localStorage.setItem('arena:savedJobData', JSON.stringify(data));
     const { queueHost, queueName } = window.arenaInitialPayload;
     $.ajax({
-      url: `/api/queue/${queueHost}/${queueName}/job`,
+      url: `${basePath}/api/queue/${queueHost}/${queueName}/job`,
       type: 'POST',
       data: JSON.stringify(data),
       contentType: 'application/json'

diff --git a/src/server/views/layout.hbs b/src/server/views/layout.hbs
@@ -23,8 +23,8 @@
     <link rel="stylesheet" href="{{ basePath }}/dashboard.css">
     <script>hljs.initHighlightingOnLoad();</script>
 
-    <link rel="stylesheet" href="{{ vendorPath }}/jsoneditor.min.css">
-    <link rel="stylesheet" href="{{ vendorPath }}/tablesort.css">
+    <link rel="stylesheet" href="{{ basePath }}{{ vendorPath }}/jsoneditor.min.css">
+    <link rel="stylesheet" href="{{ basePath }}{{ vendorPath }}/tablesort.css">
   </head>
 
   <body>
@@ -66,13 +66,13 @@
     <script type="text/javascript" src="{{ basePath }}/bootstrap.min.js"></script>
     {{/if}}
 
-    <script type="text/javascript" src="{{ vendorPath }}/jsoneditor.min.js"></script>
-    <script type="text/javascript" src="{{ vendorPath }}/tablesort.min.js"></script>
+    <script type="text/javascript" src="{{ basePath }}{{ vendorPath }}/jsoneditor.min.js"></script>
+    <script type="text/javascript" src="{{ basePath }}{{ vendorPath }}/tablesort.min.js"></script>
 
     <script type="text/javascript" src="{{ basePath }}/dashboard.js"></script>
     <script>
       {{{block "script"}}}
     </script>
   </body>
 
-</html>
+</html>