diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 91c34163d..d19afd600 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -496,7 +496,6 @@ CREATE TABLE `Monitors` ( `TrackDelay` smallint(5) unsigned, `ReturnLocation` tinyint(3) NOT NULL default '-1', `ReturnDelay` smallint(5) unsigned, - `DefaultView` enum('Events','Control') NOT NULL default 'Events', `DefaultRate` smallint(5) unsigned NOT NULL default '100', `DefaultScale` smallint(5) unsigned NOT NULL default '100', `SignalCheckPoints` INT UNSIGNED NOT NULL default '0', diff --git a/db/zm_update-1.32.3.sql b/db/zm_update-1.32.3.sql index fe38baede..8f898de6b 100644 --- a/db/zm_update-1.32.3.sql +++ b/db/zm_update-1.32.3.sql @@ -7,3 +7,5 @@ -- INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100); + +ALTER TABLE Monitors DROP COLUMN DefaultView; diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index c030a151f..c2e6f357a 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -113,7 +113,6 @@ if ( ! $monitor ) { 'FPSReportInterval' => 100, 'RefBlendPerc' => 6, 'AlarmRefBlendPerc' => 6, - 'DefaultView' => 'Events', 'DefaultRate' => '100', 'DefaultScale' => '100', 'SignalCheckPoints' => '10', @@ -657,7 +656,6 @@ if ( $tab != 'misc' ) { - @@ -1010,17 +1008,6 @@ if ( $monitor->Type() == 'Local' ) { - DefaultRate() ); ?> DefaultScale() ); ?>