Merge pull request #1529 from ProcessMaker/bugfix/FOUR-13078

FOUR-13078: Clicking in view all request shows server error
ProcessMaker · Feb 6, 2024 · 6f51502 · 6f51502
2 parents 431ffae + 7342244
commit 6f51502
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/src/components/renderer/form-empty-table.vue b/src/components/renderer/form-empty-table.vue
@@ -21,7 +21,7 @@ export default {
   },
   methods: {
     openLink() {
-      window.open(this.link, "_blank");
+      window.open(this.url, "_blank");
     }
   }
 };

diff --git a/src/components/renderer/form-requests.vue b/src/components/renderer/form-requests.vue
@@ -48,7 +48,7 @@
     </vuetable>
   </div>
   <div v-else>
-    <formEmpty link="Requests" title="No Requests to Show" url="/requests" />
+    <formEmpty link="Requests" title="No Requests to Show" :url="noDataUrl" />
   </div>
 </template>
 
@@ -81,6 +81,11 @@ export default {
       ]
     };
   },
+  computed: {
+    noDataUrl() {
+      return `${window.ProcessMaker?.app?.url}/requests`;
+    }
+  },
   mounted() {
     this.setFields();
     this.pmql = `requester = "${Processmaker.user.username}"`;

diff --git a/src/components/renderer/form-tasks.vue b/src/components/renderer/form-tasks.vue
@@ -46,7 +46,7 @@
     <component :is="tasksPreview" ref="preview-sidebar" />
   </div>
   <div v-else>
-    <formEmpty link="Tasks" title="No tasks in sight" url="/tasks" />
+    <formEmpty link="Tasks" title="No tasks in sight" :url="noDataUrl" />
   </div>
 </template>
 
@@ -82,6 +82,11 @@ export default {
         (window.SharedComponents && window.SharedComponents.TasksHome) || {}
     };
   },
+  computed: {
+    noDataUrl() {
+      return `${window.ProcessMaker?.app?.url}/tasks`;
+    }
+  },
   mounted() {
     this.setFields();
     this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "In Progress")`;

diff --git a/src/main.js b/src/main.js
@@ -110,13 +110,17 @@ const cacheEnabled = document.head.querySelector(
 const cacheTimeout = document.head.querySelector(
   "meta[name='screen-cache-timeout']"
 );
-
+// Get the current protocol, hostname, and port
+const { protocol, hostname, port } = window.location;
 window.ProcessMaker = {
   isStub: true,
   user: {
     id: 1,
     lang: "en"
   },
+  app: {
+    url: `${protocol}//${hostname}:${port}` // Create a URL with the current port
+  },
   apiClient: {
     create() {
       return this;