webui: move formatEnabledDisabledStatus to custom-functions.js

Move the formatEnabledDisabledStatus function to custom-functions.js and use it in all places.
bareos · Mar 12, 2020 · 31d8a12 · 31d8a12
1 parent 07f4e18
commit 31d8a12
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/webui/module/Client/view/client/client/index.phtml b/webui/module/Client/view/client/client/index.phtml
@@ -124,14 +124,6 @@ $this->headTitle($title);
 
    var clients = null;
 
-   function formatEnabledDisabledStatus(value) {
-      if(value) {
-         return '<span class="label label-success"><?php echo $this->translate("Enabled"); ?></span>';
-      } else {
-         return '<span class="label label-danger"><?php echo $this->translate("Disabled"); ?></span>';
-      }
-   }
-
    function formatUname(value) {
       if(value.toLowerCase().search("suse") > -1) {
          return '<img src="<?php echo $this->basePath('img/icons/os/suse.png'); ?>" id="icon-os" title="'+value+'" data-toggle="tooltip" data-placement="top">';

diff --git a/webui/module/Job/view/job/job/actions.phtml b/webui/module/Job/view/job/job/actions.phtml
@@ -134,15 +134,6 @@ $this->headTitle($title);
       return '<a href="<?php echo $this->basePath() . '/job/index?jobname='; ?>'+value+'">'+value+'</a>';
    }
 
-   function formatStatusClient(value) {
-      if(value) {
-         return '<span class="label label-success"><?php echo $this->translate("Enabled"); ?></span>';
-      }
-      else {
-         return '<span class="label label-danger"><?php echo $this->translate("Disabled"); ?></span>';
-      }
-   }
-
    function attachJobActionsTable() {
       jobactions = $('#jobactions').bootstrapTable({
          locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
@@ -172,7 +163,7 @@ $this->headTitle($title);
                field: 'enabled',
                sortable: true,
                formatter: function(value) {
-                  return formatStatusClient(value);
+                  return formatEnabledDisabledStatus(value);
                }
             },
             {

diff --git a/webui/module/Schedule/view/schedule/schedule/index.phtml b/webui/module/Schedule/view/schedule/schedule/index.phtml
@@ -158,12 +158,7 @@ $this->headTitle($title);
                field: 'enabled',
                sortable: true,
                formatter: function(value) {
-                  if(value) {
-                     return '<span class="label label-success"><?php echo $this->translate("Enabled"); ?></span>';
-                  }
-                  else {
-                     return '<span class="label label-danger"><?php echo $this->translate("Disabled"); ?></span>';
-                  }
+                  return formatEnabledDisabledStatus(value);
                }
             },
             {

diff --git a/webui/public/js/custom-functions.js b/webui/public/js/custom-functions.js
@@ -468,3 +468,11 @@ function formatJobStatus(data) {
    return output;
 }
 
+function formatEnabledDisabledStatus(value) {
+   if(value) {
+      return '<span class="label label-success">' + iJS._("Enabled") + '</span>';
+   } else {
+      return '<span class="label label-danger">' + iJS._("Disabled") + '</span>';
+   }
+}
+