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

Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one

This commit is contained in:
Kfir Itzhak 2014-01-05 08:59:09 +02:00
parent faaf237731
commit a962815624
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/zm_create.sql.in
View File

@ -353,7 +353,7 @@ CREATE TABLE `Monitors` (
`AlarmMaxFPS` decimal(5,2) default NULL, `AlarmMaxFPS` decimal(5,2) default NULL,
`FPSReportInterval` smallint(5) unsigned NOT NULL default '250', `FPSReportInterval` smallint(5) unsigned NOT NULL default '250',
`RefBlendPerc` tinyint(3) unsigned NOT NULL default '6', `RefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
`AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '3', `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
`Controllable` tinyint(3) unsigned NOT NULL default '0', `Controllable` tinyint(3) unsigned NOT NULL default '0',
`ControlId` int(10) unsigned NOT NULL default '0', `ControlId` int(10) unsigned NOT NULL default '0',
`ControlDevice` varchar(255) default NULL, `ControlDevice` varchar(255) default NULL,

4
db/zm_update-1.26.5.sql
View File

@ -14,10 +14,12 @@ SET @s = (SELECT IF(
AND column_name = 'AlarmRefBlendPerc' AND column_name = 'AlarmRefBlendPerc'
) > 0, ) > 0,
"SELECT 1", "SELECT 1",
"ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '3' AFTER `RefBlendPerc`" "ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '6' AFTER `RefBlendPerc`"
)); ));
PREPARE stmt FROM @s; PREPARE stmt FROM @s;
EXECUTE stmt; EXECUTE stmt;
UPDATE `Monitors` SET `AlarmRefBlendPerc` = `RefBlendPerc`;

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

@ -96,7 +96,7 @@ else
'AlarmMaxFPS' => "", 'AlarmMaxFPS' => "",
'FPSReportInterval' => 1000, 'FPSReportInterval' => 1000,
'RefBlendPerc' => 6, 'RefBlendPerc' => 6,
'AlarmRefBlendPerc' => 3, 'AlarmRefBlendPerc' => 6,
'DefaultView' => 'Events', 'DefaultView' => 'Events',
'DefaultRate' => '100', 'DefaultRate' => '100',
'DefaultScale' => '100', 'DefaultScale' => '100',