ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1624 from bhaal2/storageareas 

Storageareas
This commit is contained in:
Isaac Connor 2016-09-14 10:02:30 -04:00 committed by GitHub
parent 85b2ba73ab cd0e6ba285
commit f222048195
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/views/filter.php
View File

@ -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'];
}

2
web/skins/classic/views/monitor.php
View File

@ -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 ) {