webui: move formatUpdateStatus to custom-functions.js

bareos · Mar 12, 2020 · 40eacee · 40eacee
1 parent 4ead786
commit 40eacee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/webui/module/Client/view/client/client/index.phtml b/webui/module/Client/view/client/client/index.phtml
@@ -124,24 +124,6 @@ $this->headTitle($title);
 
    var basePath = "<?php echo $this->basePath(); ?>";
    var clients = null;
-
-   function formatUpdateStatus(value, row, index) {
-      if(row.available_fd === "" || row.available_fd === null || row.available_fd === undefined) {
-         return '<span class="label label-default" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Unknown update status">'+row.installed_fd+'</span>';
-      }
-      if(row.update_fd === true) {
-         if(row.update_dird === true) {
-            return '<span class="label label-danger" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Version '+row.available_fd+' is available">'+row.installed_fd+'</span> <span class="text-danger" data-toggle="tooltip" data-placement="top">(Director upgrade '+row.available_dird+' required first)</span>';
-         }
-         else {
-            return '<span class="label label-danger" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Version '+row.available_fd+' is available">'+row.installed_fd+'</span>';
-         }
-      }
-      else {
-         return '<span class="label label-success" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Up to date">'+row.installed_fd+'</span>';
-      }
-   }
-
    function clientsActionButtonsFormatter(value, row, index) {
 
       let restoreButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath() . '/restore/index?client='; ?>'+row.name+'" title="<?php echo $this->translate("Restore"); ?>" id="btn-1"><span class="glyphicon glyphicon-import"></span></a>';

diff --git a/webui/public/js/custom-functions.js b/webui/public/js/custom-functions.js
@@ -523,3 +523,20 @@ function formatUname(value, basePath) {
       return '';
    }
 }
+
+function formatUpdateStatus(value, row, index) {
+   if(row.available_fd === "" || row.available_fd === null || row.available_fd === undefined) {
+      return '<span class="label label-default" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Unknown update status">'+row.installed_fd+'</span>';
+   }
+   if(row.update_fd === true) {
+      if(row.update_dird === true) {
+         return '<span class="label label-danger" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Version '+row.available_fd+' is available">'+row.installed_fd+'</span> <span class="text-danger" data-toggle="tooltip" data-placement="top">(Director upgrade '+row.available_dird+' required first)</span>';
+      }
+      else {
+         return '<span class="label label-danger" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Version '+row.available_fd+' is available">'+row.installed_fd+'</span>';
+      }
+   }
+   else {
+      return '<span class="label label-success" id="label-fd-version" data-toggle="tooltip" data-placement="top" title="Up to date">'+row.installed_fd+'</span>';
+   }
+}