From 33fc47c4b10add604bcbab3bd6a37f60f364998c Mon Sep 17 00:00:00 2001
From: bhaal2 <bhaal@darkrealm.net>
Date: Wed, 14 Sep 2016 23:53:52 +1000
Subject: [PATCH 1/2] StorageId now defaults to 0 (NOT NULL) in the Monitors
 table, updates to filter.php set the default Id for the default storage area
 to 0

---
 web/skins/classic/views/filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 5a591ec0e..757fd1bee 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -231,7 +231,7 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
 <?php
         } elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "StorageId" ) {
             $storageareas = array();
-            $storageareas['NULL'] = 'Default ' . ZM_DIR_EVENTS;
+            $storageareas[0] = 'Default ' . ZM_DIR_EVENTS;
             foreach ( dbFetchAll( "SELECT Id,Name FROM Storage ORDER BY lower(Name) ASC" ) as $storage ) {
               $storageareas[$storage['Id']] = $storage['Name'];
             }

From cd0e6ba285efcd94eb54d96fdca1e6727b09033d Mon Sep 17 00:00:00 2001
From: bhaal2 <bhaal@darkrealm.net>
Date: Wed, 14 Sep 2016 23:56:05 +1000
Subject: [PATCH 2/2] StorageId now defaults to 0 and database column now set
 to NOT NULL.  Changed default Id in php to match

---
 web/skins/classic/views/monitor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index dc99fa732..b01a07f09 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -683,7 +683,7 @@ switch ( $tab )
         </td></tr>
         <tr><td><?php echo translate('StorageArea') ?></td><td>
         <?php
-        $storage_areas = array(''=>'Default');
+        $storage_areas = array(0=>'Default');
       $result = dbQuery( 'SELECT * FROM Storage ORDER BY Name');
       $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Storage' );
       foreach ( $results as $row => $storage_obj ) {