Display backup job stored files

bareos · Apr 29, 2016 · 0b2e9c7 · 0b2e9c7
1 parent 95b9c8e
commit 0b2e9c7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/module/Client/view/client/client/details.phtml b/module/Client/view/client/client/details.phtml
@@ -158,7 +158,8 @@ $(document).ready(function() {
          { "data": "fileset" },
          { "data": "level" },
          { "data": "jobfiles" },
-         { "data": "jobbytes", "type": "file-size" }
+         { "data": "jobbytes", "type": "file-size" },
+         { "data": null }
       ],
       "paging": true,
       "ordering": true,
@@ -184,6 +185,12 @@ $(document).ready(function() {
             "render": function(data, type, full, meta) {
                return formatBytes(data);
             }
+         },
+         {
+            "targets": 6,
+            "render": function(data, type, full, meta) {
+               return '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/restore/?type=client&mergefilesets=1&mergejobs=1&client='+data.client+'&jobid='+data.jobid+'" title="Show Files" id="btn-1"><span class="glyphicon glyphicon-folder-open"></span></a>';
+            }
          }
       ]
    } );
@@ -192,6 +199,10 @@ $(document).ready(function() {
       $('[data-toggle="tooltip"]').tooltip();
    } );
 
+   $('#tab-backups tbody').on('mouseover', '#btn-1', function () {
+      $('[data-toggle="tooltip"]').tooltip();
+   } );
+
 } );
 
 </script>
diff --git a/module/Client/view/client/client/index.phtml b/module/Client/view/client/client/index.phtml
@@ -30,7 +30,7 @@ $this->headTitle($title);
 
 <div class="row">
 
-<div class="col-md-6">
+<div class="col-md-8">
 <div class="panel panel-default">
 
 <div class="panel-heading">
@@ -44,7 +44,6 @@ $this->headTitle($title);
 <thead class="bg-primary">
    <th><?php echo $this->translate("Name"); ?></th>
    <th><?php echo $this->translate("Filedaemon"); ?></th>
-   <th><?php echo $this->translate("Version"); ?></th>
    <th><?php echo $this->translate("Actions"); ?></th>
 </thead>
 

diff --git a/module/Job/view/job/job/index.phtml b/module/Job/view/job/job/index.phtml
@@ -258,6 +258,7 @@ $(document).ready(function() {
                   switch(data.jobstatus) {
                      case 'T':
                      case 'W':
+                        return '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath() . '/job/rerun/'; ?>'+data.jobid+'" title="Rerun" id="btn-1"><span class="glyphicon glyphicon-repeat"></span></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/restore/?type=client&mergefilesets=1&mergejobs=1&client='+data.client+'&jobid='+data.jobid+'" title="Show Files" id="btn-1"><span class="glyphicon glyphicon-folder-open"></span></a>';
                      case 'E':
                      case 'e':
                      case 'f':