webui: move clientActionButtonsFormatter to custom-functions.js

bareos · Mar 18, 2020 · c623e46 · c623e46
1 parent 54cb434
commit c623e46
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/webui/module/Client/view/client/client/details.phtml b/webui/module/Client/view/client/client/details.phtml
@@ -164,16 +164,7 @@ $this->headTitle($title);
 
 <script>
 
-   var clientdetails = null;
-   var clientbackups = null;
-
-   function clientActionButtonsFormatter(value, row, index) {
-
-      let clientRestoreButton = '<a href="<?php echo $this->basePath() . '/restore/index?client='; ?>'+row.name+'"><button type="button" class="btn btn-default btn-xs" id="btn-1" data-toggle="tooltip" data-placement="top" title="<?php echo $this->translate("Restore"); ?>"><span class="glyphicon glyphicon-import"></span></button></a>';
-      let clientStatusButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/client/status?client='+row.name+'" title="<?php echo $this->translate("Status"); ?>" id="btn-1"><span class="glyphicon glyphicon-zoom-in"></span></a>';
-
-      return clientRestoreButton + '&nbsp;' + clientStatusButton;
-   }
+   var basePath = "<?php echo $this->basePath(); ?>";
 
    function jobActionButtonsFormatter(value, row, index) {
       let jobDetailsButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath();?>/job/details/'+row.jobid+'" title="<?php echo $this->translate("View Job Details"); ?>" id="btn-0"><span class="glyphicon glyphicon-search"></span></a>';
@@ -183,7 +174,7 @@ $this->headTitle($title);
    }
 
    function attachClientDetails() {
-      clientdetails = $('#clientdetails').bootstrapTable({
+      $('#clientdetails').bootstrapTable({
          locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
          cookie: <?php echo $_SESSION['bareos']['dt_statesave']; ?>,
          cookieIdTable: 'dashboard_table_jobs_last_status',
@@ -218,15 +209,15 @@ $this->headTitle($title);
             {
                field: 'action',
                formatter: function(value, row, index) {
-                  return clientActionButtonsFormatter(value, row, index);
+                  return clientActionButtonsFormatter(value, row, index, basePath);
                }
             }
          ]
       });
    }
 
    function attachClientBackups() {
-      clientbackups = $('#clientbackups').bootstrapTable({
+      $('#clientbackups').bootstrapTable({
          locale: '<?php echo str_replace('_','-', $_SESSION['bareos']['locale']); ?>',
          cookie: <?php echo $_SESSION['bareos']['dt_statesave']; ?>,
          cookieIdTable: 'client_clientbackups',

diff --git a/webui/public/js/custom-functions.js b/webui/public/js/custom-functions.js
@@ -541,6 +541,14 @@ function formatUpdateStatus(value, row, index) {
    }
 }
 
+function formatScheduleName(value, basePath) {
+   return '<a href="' + basePath + '/schedule/details?schedule=' + value + '">' + value + '</a>';
+}
+
+function formatClientName(value, basePath) {
+   return '<a href="' + basePath + '/client/details/' + value + '">' + value + '</a>';
+}
+
 function clientsActionButtonsFormatter(value, row, index, basePath) {
    let restoreButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/restore/index?client=' + row.name + '" title="' + iJS._("Restore") + '" id="btn-1"><span class="glyphicon glyphicon-import"></span></a>';
    let statusClientButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/client/status?client=' + row.name + '" title="' + iJS._("Status") + '" id="btn-1"><span class="glyphicon glyphicon-search"></span></a>';
@@ -566,6 +574,13 @@ function clientsActionButtonsFormatter(value, row, index, basePath) {
    }
 }
 
+function clientActionButtonsFormatter(value, row, index, basePath) {
+   let clientRestoreButton = '<a href="' + basePath + '/restore/index?client=' + row.name + '"><button type="button" class="btn btn-default btn-xs" id="btn-1" data-toggle="tooltip" data-placement="top" title="' + iJS._("Restore") + '"><span class="glyphicon glyphicon-import"></span></button></a>';
+   let clientStatusButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/client/status?client=' + row.name + '" title="' + iJS._("Status") + '" id="btn-1"><span class="glyphicon glyphicon-search"></span></a>';
+
+   return clientRestoreButton + '&nbsp;' + clientStatusButton;
+}
+
 function scheduleActionButtonsFormatter(value, row, index, basePath) {
    let disableButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/schedule/index?action=disable&schedule=' + row.name + '" title="' + iJS._("Disable") + '" id="btn-1"><span class="glyphicon glyphicon-remove"></span></a>';
    let enableButton = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="' + basePath + '/schedule/index?action=enable&schedule=' + row.name + '" title="' + iJS._("Enable") + '" id="btn-1"><span class="glyphicon glyphicon-ok"></span></a>';
@@ -576,11 +591,3 @@ function scheduleActionButtonsFormatter(value, row, index, basePath) {
       return enableButton;
    }
 }
-
-function formatScheduleName(value, basePath) {
-   return '<a href="' + basePath + '/schedule/details?schedule=' + value + '">' + value + '</a>';
-}
-
-function formatClientName(value, basePath) {
-   return '<a href="' + basePath + '/client/details/' + value + '">' + value + '</a>';
-}