Title: [opsview] [5343] Fixed systempreferences changes setting configuration status light
- Revision
- 5343
- Author
- tvoon
- Date
- 2010-11-09 10:22:50 +0000 (Tue, 09 Nov 2010)
Log Message
Fixed systempreferences changes setting configuration status light
Modified Paths
Added Paths
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2010-11-09 08:59:07 UTC (rev 5342)
+++ trunk/CHANGES 2010-11-09 10:22:50 UTC (rev 5343)
@@ -3,6 +3,7 @@
????
FIXES:
Fixed servicegroup popup list for service check new page
+ Fixed systempreferences changes setting configuration status light
3.9.1.5340 8th November 2010
FIXES:
Modified: trunk/opsview-core/lib/Opsview/ResultSet/Systempreferences.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/ResultSet/Systempreferences.pm 2010-11-09 08:59:07 UTC (rev 5342)
+++ trunk/opsview-core/lib/Opsview/ResultSet/Systempreferences.pm 2010-11-09 10:22:50 UTC (rev 5343)
@@ -21,4 +21,13 @@
use base qw/Opsview::ResultSet/;
+use MRO::Compat;
+
+# Set the uncommitted flag when changes come in
+sub synchronise {
+ my ( $self, @args ) = @_;
+ $self->result_source->schema->resultset("Metadata")->find("uncommitted")->update( { value => 1 } );
+ $self->next::method(@args);
+}
+
1;
Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Systempreference.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Systempreference.pm 2010-11-09 08:59:07 UTC (rev 5342)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Systempreference.pm 2010-11-09 10:22:50 UTC (rev 5343)
@@ -29,7 +29,7 @@
__PACKAGE__->config(
# not sure why, but the model_name can't be OpsviewDB
- model_name => 'OpsviewSchema::Systempreference',
+ model_name => 'OpsviewSchema::Systempreferences',
use_synchronise => {
log_notifications => 0,
log_service_retries => 0,
Added: trunk/opsview-web/t/867systempreference.t
===================================================================
--- trunk/opsview-web/t/867systempreference.t (rev 0)
+++ trunk/opsview-web/t/867systempreference.t 2010-11-09 10:22:50 UTC (rev 5343)
@@ -0,0 +1,50 @@
+#!perl
+# Test systempreference page
+
+use warnings;
+use strict;
+
+use FindBin qw($Bin);
+use lib "$Bin/lib";
+use lib "/usr/local/nagios/lib", "/usr/local/nagios/etc", "/usr/local/nagios/t/lib";
+
+use Test::WWW::Mechanize;
+use HTTP::Cookies;
+use Sys::Hostname;
+
+use Opsview::Test qw(opsview);
+use Opsview::Web::Test;
+use Opsview::TestUtils;
+
+use Opsview::Contact;
+use Opsview::Config;
+
+use Test::More qw(no_plan);
+use Test::Deep;
+
+# Set hostname
+my $hostname = Sys::Hostname::hostname;
+$hostname = "localhost:3000";
+
+my $ua = Test::WWW::Mechanize->new;
+use Opsview::Schema;
+my $schema = Opsview::Schema->my_connect;
+$schema->resultset("Metadata")->find( { name => "uncommitted" } )->update( { value => 0 } );
+
+log_in( $ua, 'admin', 'initial', "http://localhost:3000" );
+
+$ua->get_ok("http://$hostname/admin/systempreference");
+$ua->form_name('main_form');
+is( $ua->value('soft_state_dependencies'), undef, "soft_state_dependencies not ticked" );
+
+$ua->tick('soft_state_dependencies',1);
+$ua->submit;
+
+$ua->content_contains('Successfully saved');
+
+$ua->form_name('main_form');
+is( $ua->value('soft_state_dependencies'), 1, "soft_state_dependencies ticked" );
+
+is( $schema->resultset("Metadata")->find( { name => "uncommitted" })->value, 1, "uncommitted flag set" );
+
+
Property changes on: trunk/opsview-web/t/867systempreference.t
___________________________________________________________________
Added: svn:executable
+ *
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
