webui: move formatClientName to custom-functions.js

bareos · Mar 18, 2020 · 551c4dc · 551c4dc
1 parent 8c37c58
commit 551c4dc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/webui/module/Dashboard/view/dashboard/dashboard/index.phtml b/webui/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -190,7 +190,7 @@ $this->headTitle($title);
                field: 'client',
                sortable: true,
                formatter: function(value) {
-                  return '<a href="<?php echo $this->basePath() . '/client/details/'; ?>'+value+'">'+value+'</a>';
+                  return formatClientName(value, basePath);
                }
             },
             {

diff --git a/webui/module/Job/view/job/job/details.phtml b/webui/module/Job/view/job/job/details.phtml
@@ -191,7 +191,7 @@ $this->headTitle($title);
             {
                field: 'client',
                formatter: function(value) {
-                  return '<a href="<?php echo $this->basePath() . '/client/details/'; ?>'+value+'">'+value+'</a>';
+                  return formatClientName(value, basePath);
                }
             },
             {

diff --git a/webui/module/Job/view/job/job/index.phtml b/webui/module/Job/view/job/job/index.phtml
@@ -376,10 +376,6 @@ $this->headTitle($title);
 
    }
 
-   function formatClientName(value) {
-      return '<a href="<?php echo $this->basePath() . '/client/details/'; ?>'+value+'">'+value+'</a>';
-   }
-
    function attachJobTable() {
       jobtable = $('#jobtable').bootstrapTable({
          locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
@@ -419,7 +415,7 @@ $this->headTitle($title);
                field: 'client',
                sortable: true,
                formatter: function(value) {
-                  return formatClientName(value);
+                  return formatClientName(value, basePath);
                }
             },
             {

diff --git a/webui/module/Media/view/media/media/details.phtml b/webui/module/Media/view/media/media/details.phtml
@@ -271,7 +271,7 @@ $this->headTitle($title);
                field:  'client',
                sortable: true,
                formatter: function(value) {
-                  return '<a href="<?php echo $this->basePath() . '/client/details/'; ?>'+value+'">'+value+'</a>';
+                  return formatClientName(value, basePath);
                }
             },
             {

diff --git a/webui/public/js/custom-functions.js b/webui/public/js/custom-functions.js
@@ -114,6 +114,10 @@ function formatJobName(value, basePath, displayRange) {
    }
 }
 
+function formatClientName(value, basePath) {
+   return '<a href="' + basePath + '/client/details/' + value + '">' + value + '</a>';
+}
+
 function formatJobType(data) {
    var output;
    switch(data) {