From 481363194dbb9edffe141f8a5ddc47cd1506e4b3 Mon Sep 17 00:00:00 2001
From: Joseph Tingiris <joseph.tingiris@gmail.com>
Date: Tue, 18 Feb 2020 16:13:41 -0500
Subject: [PATCH] Add Size column to edit Storage Settings table (#11164)

* add storage_size

* capitalize Settings to match Device Settings, SNMP Settings, etc.
---
 includes/html/pages/device/edit/storage.inc.php | 3 ++-
 includes/html/table/storage-edit.inc.php        | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/includes/html/pages/device/edit/storage.inc.php b/includes/html/pages/device/edit/storage.inc.php
index 104df607ca..216d61be7b 100644
--- a/includes/html/pages/device/edit/storage.inc.php
+++ b/includes/html/pages/device/edit/storage.inc.php
@@ -14,7 +14,7 @@
 
 ?>
 
-<h3>Storage settings</h3>
+<h3>Storage Settings</h3>
 
 <div class="table-responsive">
     <table id="storage" class="table table-hover table-condensed storage">
@@ -22,6 +22,7 @@
         <tr>
             <th data-column-id="hostname">Device</th>
             <th data-column-id="storage_descr">Storage</th>
+            <th data-column-id="storage_size">Size</th>
             <th data-column-id="storage_perc">%</th>
             <th data-column-id="storage_perc_warn" data-formatter="perc_update" data-header-css-class="edit-storage-input">% Warn</th>
         </tr>
diff --git a/includes/html/table/storage-edit.inc.php b/includes/html/table/storage-edit.inc.php
index fba6fe3b8f..368227a506 100644
--- a/includes/html/table/storage-edit.inc.php
+++ b/includes/html/table/storage-edit.inc.php
@@ -37,12 +37,15 @@ $sql = "SELECT * $sql";
 foreach (dbFetchRows($sql, $param) as $drive) {
     $perc = round($drive['storage_perc'], 0);
     $perc_warn = round($drive['storage_perc_warn'], 0);
+    $size = formatStorage($drive['storage_size']);
     $response[] = array(
         'storage_id' => $drive['storage_id'],
         'hostname' => generate_device_link($drive),
         'storage_descr' => $drive['storage_descr'],
         'storage_perc' => $perc . "%",
-        'storage_perc_warn' => $perc_warn);
+        'storage_perc_warn' => $perc_warn,
+        'storage_size' => $size
+    );
 }
 
 $output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total);