Removes free bytes column from datatables

Because of compression it does not really make sense to show how many bytes are free on a volume.
bareos · May 19, 2016 · 8aca88f · 8aca88f
1 parent 3d43771
commit 8aca88f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/module/Media/view/media/media/details.phtml b/module/Media/view/media/media/details.phtml
@@ -60,7 +60,6 @@ $this->headTitle($title);
    <th><?php echo $this->translate("Retention/Expiration"); ?></th>
    <th><?php echo $this->translate("Maximum bytes"); ?></div></th>
    <th><?php echo $this->translate("Current bytes"); ?></div></th>
-   <th><?php echo $this->translate("Free bytes"); ?></div></th>
 </thead>
 
 </table>
@@ -298,7 +297,6 @@ $(document).ready(function() {
          { "data": null },
          { "type": "file-size", "data": "maxvolbytes" },
          { "type": "file-size", "data": "volbytes" },
-         { "type": "file-size", "data": null },
          { "data": "lastwritten" }
       ],
       "columnDefs": [
@@ -310,7 +308,7 @@ $(document).ready(function() {
          },
          {
             "targets": 4,
-            "orderData": 10,
+            "orderData": 9,
             "render": function(data, type, full, meta) {
                return formatLastWritten(data);
             }
@@ -335,12 +333,6 @@ $(document).ready(function() {
          },
          {
             "targets": 9,
-            "render": function(data, type, full, meta) {
-               return formatFreeBytes(data.maxvolbytes, data.volbytes);
-            }
-         },
-         {
-            "targets": 10,
             "visible": false,
             "searchable": false
          }

diff --git a/module/Media/view/media/media/index.phtml b/module/Media/view/media/media/index.phtml
@@ -60,7 +60,6 @@ $this->headTitle($title);
    <th><?php echo $this->translate("Retention/Expiration"); ?></th>
    <th><?php echo $this->translate("Maximum bytes"); ?></div></th>
    <th><?php echo $this->translate("Current bytes"); ?></div></th>
-   <th><?php echo $this->translate("Free bytes"); ?></div></th>
 </thead>
 
 </table>
@@ -169,7 +168,6 @@ $(document).ready(function() {
          { "data": null },
          { "type": "file-size", "data": "maxvolbytes" },
          { "type": "file-size", "data": "volbytes" },
-         { "type": "file-size", "data": null },
          { "data": "lastwritten" }
       ],
       "columnDefs": [
@@ -181,7 +179,7 @@ $(document).ready(function() {
          },
          {
             "targets": 4,
-            "orderData": 10,
+            "orderData": 9,
             "render": function(data, type, full, meta) {
                return formatLastWritten(data);
             }
@@ -206,12 +204,6 @@ $(document).ready(function() {
          },
          {
             "targets": 9,
-            "render": function(data, type, full, meta) {
-               return formatFreeBytes(data.maxvolbytes, data.volbytes);
-            }
-         },
-         {
-            "targets": 10,
             "visible": false,
             "searchable": false
          }

diff --git a/module/Pool/view/pool/pool/details.phtml b/module/Pool/view/pool/pool/details.phtml
@@ -92,7 +92,6 @@ $this->headTitle($title);
    <th><?php echo $this->translate("Retention/Expiration"); ?></th>
    <th><?php echo $this->translate("Maximum bytes"); ?></th>
    <th><?php echo $this->translate("Current bytes"); ?></th>
-   <th><?php echo $this->translate("Free bytes"); ?></th>
 </thead>
 
 </table>
@@ -213,7 +212,6 @@ $(document).ready(function() {
          { "data": null },
          { "data": "maxvolbytes", "type": "file-size" },
          { "data": "volbytes", "type": "file-size" },
-         { "data": null, "type": "file-size" },
          { "data": "lastwritten" }
       ],
       "paging": true,
@@ -231,7 +229,7 @@ $(document).ready(function() {
          },
          {
             "targets": 4,
-            "orderData": 10,
+            "orderData": 9,
             "render": function(data, type, full, meta) {
                return formatLastWritten(data);
             }
@@ -256,12 +254,6 @@ $(document).ready(function() {
          },
          {
             "targets": 9,
-            "render": function(data, type, full, meta) {
-               return formatFreeBytes(data.maxvolbytes, data.volbytes);
-            }
-         },
-         {
-            "targets": 10,
             "visible": false,
             "searchable": false
          }