webui: introduce storageResourceActionButtonsFormatter function

bareos · Mar 18, 2020 · 461657c · 461657c
1 parent 5f466f7
commit 461657c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/webui/module/Storage/view/storage/storage/index.phtml b/webui/module/Storage/view/storage/storage/index.phtml
@@ -5,7 +5,7 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos for the canonical source repository
- * @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2020 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -91,20 +91,7 @@ $this->headTitle($title);
 
 <script>
 
-   var storagedevices = null;
-
-   function storagedeviceActionButtonsFormatter(value, row, index) {
-
-      let deviceStatusButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/storage/status?storage='+row.name+'" title="<?php echo $this->translate("Status"); ?>" id="btn-1"><span class="glyphicon glyphicon-search"></span></a>';
-      let manageAutochangerButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath() . '/storage/details/'; ?>'+row.name+'" title="<?php echo $this->translate("Manage autochanger"); ?>" id="btn-1"><span class="glyphicon glyphicon-list-alt"></span></a>';
-
-      if(row.autochanger == "1") {
-         return devicesStatusButton + '&nbsp;' + manageAutochangerButton;
-      } else {
-         return deviceStatusButton;
-      }
-
-   }
+   var basePath = "<?php echo $this->basePath(); ?>";
 
    function attachStorageDeviceTable() {
       storagedevices = $('#storagedevices').bootstrapTable({
@@ -143,20 +130,17 @@ $this->headTitle($title);
             {
                field: 'action',
                formatter: function(value, row, index) {
-                  return storagedeviceActionButtonsFormatter(value, row, index);
+                  return storageResourceActionButtonsFormatter(value, row, index, basePath);
                }
             }
          ]
       });
    }
 
    $(document).ready(function() {
-
       setDtTextDomain('<?php echo $this->basePath() . '/js/locale'; ?>');
       setDtLocale('<?php echo $_SESSION['bareos']['locale']; ?>');
-
       attachStorageDeviceTable();
-
    });
 
 </script>

diff --git a/webui/public/js/custom-functions.js b/webui/public/js/custom-functions.js
@@ -703,3 +703,14 @@ function jobResourceActionButtonsFormatter(value, row, index, basePath) {
       return runJobButton + '&nbsp;' + enableJobButton;
    }
 }
+
+function storageResourceActionButtonsFormatter(value, row, index, basePath) {
+   let storageStatusButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/storage/status?storage=' + row.name + '" title="' + iJS._("Status") + '" id="btn-1"><span class="glyphicon glyphicon-search"></span></a>';
+   let manageAutochangerButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/storage/details/' + row.name + '" title="' + iJS._("Manage autochanger") + '" id="btn-1"><span class="glyphicon glyphicon-list-alt"></span></a>';
+
+   if(row.autochanger == "1") {
+      return storageStatusButton + '&nbsp;' + manageAutochangerButton;
+   } else {
+      return storageStatusButton;
+   }
+}