Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,12189,12322,12355,12401-12406,12428,12539-12540,12544
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12539-12540,12544
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
===================================================================
--- trunk/opsview-core/share/stylesheets/navmenu/navigation.css 2013-07-23 13:21:15 UTC (rev 13037)
+++ trunk/opsview-core/share/stylesheets/navmenu/navigation.css 2013-07-23 13:45:04 UTC (rev 13038)
@@ -648,6 +648,7 @@
background: -o-linear-gradient(top, #EAEAEA, #C1C0C0);
background: -ms-linear-gradient(top, #EAEAEA, #C1C0C0);
background: linear-gradient(top, #EAEAEA, #C1C0C0);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EAEAEA', endColorstr='#C1C0C0');
}
.opsview_wrapper_menu .opsview_menu_opsview {
-webkit-border-radius: 0px;
@@ -670,7 +671,6 @@
background: -o-linear-gradient(top, #EAEAEA, #C1C0C0);
background: -ms-linear-gradient(top, #EAEAEA, #C1C0C0);
background: linear-gradient(top, #EAEAEA, #C1C0C0);
-
width: 100%;
height: 25px;
margin: 1px 0 0;
@@ -773,6 +773,7 @@
#opsview_account_wrapper_menu .opsview_menu_opsview {
background: #3E2155;
+ filter: none;
}
#opsview_account_wrapper_menu .opsview_menu_opsview {
Modified: trunk/opsview-core/t/lib/Test/Opsview.pm
===================================================================
--- trunk/opsview-core/t/lib/Test/Opsview.pm 2013-07-23 13:21:15 UTC (rev 13037)
+++ trunk/opsview-core/t/lib/Test/Opsview.pm 2013-07-23 13:45:04 UTC (rev 13038)
@@ -230,4 +230,30 @@
return @processes;
}
+sub stop_processes {
+ my ( $self, $filter, $signal ) = @_;
+
+ $signal = 9 unless defined $signal;
+
+ subtest 'Stopping processes' => sub {
+ my @processes = $self->find_processes($filter);
+
+ SKIP: {
+ skip "No matching processes were found", 1
+ unless @processes;
+
+ my $killed = 0;
+ for my $proc (@processes) {
+ $killed += $proc->kill($signal);
+ }
+
+ is(
+ $killed,
+ scalar @processes,
+ "Killed $killed all found processes"
+ );
+ }
+ }
+}
+
1;
Modified: trunk/opsview-core/utils/optimize_db
===================================================================
--- trunk/opsview-core/utils/optimize_db 2013-07-23 13:21:15 UTC (rev 13037)
+++ trunk/opsview-core/utils/optimize_db 2013-07-23 13:45:04 UTC (rev 13038)
@@ -22,6 +22,7 @@
use lib "/usr/local/nagios/lib";
use lib "/usr/local/nagios/etc";
+use IO::File;
use Opsview::Config;
my $db = shift;
Modified: trunk/opsview-web/Makefile
===================================================================
--- trunk/opsview-web/Makefile 2013-07-23 13:21:15 UTC (rev 13037)
+++ trunk/opsview-web/Makefile 2013-07-23 13:45:04 UTC (rev 13038)
@@ -67,7 +67,7 @@
prove t/*.t
gettext:
- find lib root -type f | grep -v .svn | grep -v /discovery/ | grep -v I18N/ | grep -v .swp > gettext.files
+ find lib root -type f | grep -v '\(\.svn\|/discovery/\|I18N/\|\.swp\)' | sort > gettext.files
xgettext.pl -P perl=* -P tt2=* --output=lib/Opsview/Web/I18N/messages.pot -f gettext.files
msgmerge --no-location --no-wrap --no-fuzzy-matching --update lib/Opsview/Web/I18N/i_default.po lib/Opsview/Web/I18N/messages.pot
# This is quick, so run it everytime
Modified: trunk/opsview-web/root/admin/edit_functions_base
===================================================================
--- trunk/opsview-web/root/admin/edit_functions_base 2013-07-23 13:21:15 UTC (rev 13037)
+++ trunk/opsview-web/root/admin/edit_functions_base 2013-07-23 13:45:04 UTC (rev 13038)
@@ -114,19 +114,19 @@
[% indicator_icon( { id => ajax.action _ "_indicator" } ); -%]
<span id="[% ajax.action %]_info"></span>[%
END;
- IF args.form_label; "<br/>\n";
+ IF args.form_label; "<br/>\n";
IF args.block; "</div>\n"; END;
END;
- IF args.add_unique_validation;
+ IF args.add_unique_validation;
name = args.id || args.name;
%]
<script type="text/_javascript_">
Validation.add('validate-unique-[% name %]','Not unique',function (v,el) {
- return Validation.get('IsEmpty').test(v) || check_unique_field('[% c.uri_for("unique", c.req.params).path_query | html %]', el, '[% (object && (! clone)) ? object.$name : "" %]');
+ return Validation.get('IsEmpty').test(v) || check_unique_field('[% c.uri_for("unique", c.req.params).path_query | html %]', el, '[% (object && (! clone)) ? object.$name : "" | html %]');
});
</script>
[% END;
- IF args.add_duration_validation;
+ IF args.add_duration_validation;
%]
<script type="text/_javascript_">
Validation.add('validate-duration','Invalid duration format',function (v,el) {
@@ -138,7 +138,7 @@
%]
<script type="text/_javascript_">
Validation.add('validate-datetime','Invalid date-time',function (v,el) {
- return Validation.get('IsEmpty').test(v) || check_datetime_field('[% c.uri_for("/admin/check_datetime").path_query %]', el, '[% (object && (! clone)) ? object.$name : "" %]');
+ return Validation.get('IsEmpty').test(v) || check_datetime_field('[% c.uri_for("/admin/check_datetime").path_query %]', el, '[% (object && (! clone)) ? object.$name : "" | html %]');
});
</script>
[% END;
@@ -161,7 +161,7 @@
END;
MACRO field_help(args) BLOCK;
- FOREACH v = args.validation.split(" ");
+ FOREACH v = args.validation.split(" ");
style = 'style="display:none"';
IF v.match("^validate-unique-");
args.add_unique_validation = 1;
@@ -188,7 +188,7 @@
END;
%]<span class="error_validation" id="advice-[% v %]-[% args.id || args.name %]" [% style %]>[%
errors_lookup.$v || args.validation_advice || c.loc("ui.admin.edit.validation.generalFailure") | html
- %]</span> [%
+ %]</span> [%
END;
IF args.indicator;
IF args.name;
@@ -212,7 +212,7 @@
class = [];
END;
class = class.merge(args.validation.split(" "));
- IF class.size;
+ IF class.size;
" class='"; class.join(" "); "'";
END;
END;
@@ -223,7 +223,7 @@
<script type="text/_javascript_">
new Ajax.Autocompleter('[% args.name %]', '[% args.name %]_auto_complete', '[% c.uri_for("/admin/ajax/autocomplete_" _ args.autocomplete).path_query | escape_js_string | html %]', {indicator:'[% args.name %]_auto_complete_indicator'});
</script>
- [%
+ [%
indicator_icon( { id => args.name _ "_auto_complete_indicator" } );
END;
END;
@@ -335,7 +335,7 @@
select_start;
IF args.includeblank;
' <option value=""';
- UNLESS object.$field_name;
+ UNLESS object.$field_name;
' selected="selected"';
END;
"> </option>\n";
@@ -411,7 +411,7 @@
FOREACH obj IN object.$field_name;
f_set.$obj = 1;
END;
-
+
IF f_objects;
select_start;
FOREACH f_obj IN f_objects;
@@ -479,7 +479,7 @@
args.block=1;
field_label(args);
ELSIF args.label;
- "<label>";
+ "<label>";
END;
IF args.checked.defined;
checked = args.checked;
@@ -527,7 +527,7 @@
# If multi column, rotate the list of items so that it is ordered
# "downwards the across"
- IF args.columns > 1;
+ IF args.columns > 1;
start_index = 0;
columns = args.columns;
rows = values.size div columns;
@@ -545,7 +545,7 @@
i = i + rows;
END;
start_index = start_index + 1;
- END;
+ END;
args.values = new_values;
ELSE;
args.values = values;
@@ -663,7 +663,7 @@
title="[% c.loc(args_disabled.loc) | html %]">[% labels.$value %]</a>
</label>
[%
- ELSE;
+ ELSE;
%]
<label>
<input type="radio" name="[% args.name %]"
@@ -681,7 +681,7 @@
field_help(args);
field_label_end(args);
END;
-
+
MACRO radiobutton_group(args) BLOCK;
args.block=1;
field_label(args);
@@ -706,7 +706,7 @@
<td>
<label>
<input type="radio" name="[% args.name %]"
- [% IF args.class; 'class="'; args.class; '"'; END; %]
+ [% IF args.class; 'class="'; args.class; '"'; END; %]
value="[% value %]"
[% apply_events(args);
re = '^' _ value _ '$';
@@ -724,7 +724,7 @@
%] </tr>
</table>
[%
-
+
END;
# See admin/keywords/tab-objects for example on how to call with related chooseboxes affecting contents of others
@@ -742,13 +742,15 @@
%]<table class="choosebox" width="640"><tr><td width="250">
<select name="[% chosen_box %]" id="[% chosen_box %]"[% IF chosen_box_class; 'class="'; chosen_box_class | html; '"'; END %]
- size="6" multiple="multiple" style="width: 100%"
+ size="6" multiple="multiple" style="width: 100%"
_ondblclick_="copyToList(this.form.[% chosen_box %], this.form.[% fulllist_box %], 1); updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% args.related_choosebox.id | escape_js_string %]', '[% args.related_choosebox.class | escape_js_string %]')">
[%
relations = object.$relationship;
f_set = {};
- IF (relations.length == 0);
+ # Need to do relations.size too, as systempreferences uses an array
+ # Which seems to be catered differently form length for DBIx stuff
+ IF (relations.length == 0 || relations.size == 0);
%]<option value="temp">[% c.loc("ui.admin.edit.help.chooseFromList") | html %]</option>
[% ELSE;
FOREACH r IN relations;
@@ -760,17 +762,17 @@
%]</select>
</td><td class="centered" width="20">
- <input type="button" name="left" value="<<"
- _onclick_="copyToList(this.form.[% fulllist_box %], this.form.[% chosen_box %], 1); updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% args.related_choosebox.id | escape_js_string %]', '[% args.related_choosebox.class | escape_js_string %]')"
+ <input type="button" name="left" value="<<"
+ _onclick_="copyToList(this.form.[% fulllist_box %], this.form.[% chosen_box %], 1); updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% args.related_choosebox.id | escape_js_string %]', '[% args.related_choosebox.class | escape_js_string %]')"
/>
<br />
- <input type="button" name="right" value=">>"
- _onclick_="copyToList(this.form.[% chosen_box %], this.form.[% fulllist_box %], 1); updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% args.related_choosebox.id | escape_js_string %]', '[% args.related_choosebox.class | escape_js_string %]')"
+ <input type="button" name="right" value=">>"
+ _onclick_="copyToList(this.form.[% chosen_box %], this.form.[% fulllist_box %], 1); updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% args.related_choosebox.id | escape_js_string %]', '[% args.related_choosebox.class | escape_js_string %]')"
/>
</td><td>[%
- %]<select name="[% fulllist_box %]" id="[% fulllist_box %]"
- multiple="multiple" size="6" style="width: 100%"
+ %]<select name="[% fulllist_box %]" id="[% fulllist_box %]"
+ multiple="multiple" size="6" style="width: 100%"
_ondblclick_="copyToList(this.form.[% fulllist_box %], this.form.[% chosen_box %], 1); updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% args.related_choosebox.id | escape_js_string %]', '[% args.related_choosebox.class | escape_js_string %]')"
>
[%
@@ -779,7 +781,7 @@
id = option.id;
NEXT IF f_set.$id;
%]<option title="[% option.$display_field | html %]" value="[% id | html %]">[% option.$display_field | html %]</option>[%
- END;
+ END;
%]</select>[%
IF args.filter_options;
@@ -789,7 +791,7 @@
filter_class = filter_option.class || filter_id;
filter_text = filter_option.text;
%]<label>
- <input type="checkbox" name=".[% filter_id | html %]" id="[% filter_id | html %]" class="checkbox [% filter_class | html %]" value="1"
+ <input type="checkbox" name=".[% filter_id | html %]" id="[% filter_id | html %]" class="checkbox [% filter_class | html %]" value="1"
_onclick_="updateChooseboxList('[% c.uri_for(".").path | escape_js_string %]', '[% chosen_box | escape_js_string %]', '[% filter_class | escape_js_string %]')"
[%- IF checked; %]checked="checked"[% END -%]
/>
Modified: trunk/opsview-web/t/101uri_for_path.t
===================================================================
--- trunk/opsview-web/t/101uri_for_path.t 2013-07-23 13:21:15 UTC (rev 13037)
+++ trunk/opsview-web/t/101uri_for_path.t 2013-07-23 13:45:04 UTC (rev 13038)
@@ -13,14 +13,17 @@
use lib "/usr/local/nagios/lib", "/usr/local/nagios/etc",
"/usr/local/nagios/t/lib";
-use Test::More;
+use Test::More tests => 1;
-plan "no_plan";
-
my $cur_file;
-my $errors = 0;
-my $file_filter =
- sub { ( $File::Next::name !~ /\.svn/ && $_ ne "Web.pm" && $_ !~ /\.po.?$/ ) };
+my $errors = 0;
+my $file_filter = sub {
+ ( $File::Next::name !~ /\.svn/
+ && $_ ne "Web.pm"
+ && $_ !~ /\.po.?$/
+ && $_ !~ /\.js$/
+ && $_ !~ /\.sw.$/ );
+};
my $files = File::Next::files( { file_filter => $file_filter },
"$Bin/../lib", "$Bin/../root" );
while ( defined( my $file = $files->() ) ) {
@@ -69,7 +72,7 @@
}
next
if $cur_file eq "lib/Opsview/Web/Controller/Root.pm"
- && $tokens[0] =~ /atom/;
+ && $tokens[0] =~ /atom/;
unless ( $tokens[1] eq any(qw( . -> ))
&& $tokens[2] =~ /^(?:as_string|path)/ )
{
