mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-24 14:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

when saving a new layout, auto-select it

Browse Source
This commit is contained in:
Isaac Connor
2017-11-01 12:19:27 -04:00
parent ac9116e78b
commit d4080dcdbd
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/actions.php
View File

@@ -694,6 +694,10 @@ if ( canEdit( 'System' ) ) {
}
$Layout->Positions( $_REQUEST['Positions'] );
$Layout->save();
session_start();
$_SESSION['zmMontageLayout'] = $Layout->Id();
session_write_close();
unset( $_COOKIE['zmMontageLayout'] );
} // end if save
} else if ( $_REQUEST['object'] == 'server' ) {

10
web/skins/classic/views/montage.php
View File

@@ -65,11 +65,15 @@ foreach ( $layouts as $l ) {
$layoutsById[$l->Id()] = $l->Name();
}
$layout = '';
if ( isset($_COOKIE['zmMontageLayout']) )
$layout = $_COOKIE['zmMontageLayout'];
session_start();
$layout = '';
if ( isset($_COOKIE['zmMontageLayout']) )
$layout = $_SESSION['zmMontageLayout'] = $_COOKIE['zmMontageLayout'];
elseif ( isset($_SESSION['zmMontageLayout']) )
$layout = $_SESSION['zmMontageLayout'];
$options = array();
if ( isset($_COOKIE['zmMontageWidth']) and $_COOKIE['zmMontageWidth'] ) {
$_SESSION['zmMontageWidth'] = $options['width'] = $_COOKIE['zmMontageWidth'];