Modified: trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Keyword.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Keyword.pm 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Keyword.pm 2012-07-17 13:24:05 UTC (rev 9580)
@@ -39,6 +39,7 @@
all_servicechecks => 0,
public => 0,
show_contextual_menus => 0,
+ exclude_handled => 0,
},
);
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1202,6 +1202,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr ""
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr ""
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr ""
@@ -1247,6 +1250,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Beschreibung"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr ""
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Hosts"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/es.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1216,6 +1216,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr ""
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr ""
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr ""
@@ -1261,6 +1264,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Descripción"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr ""
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Hosts"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/fr.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1200,6 +1200,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr "Tous les contrôles de service"
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr ""
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr "Hôtes"
@@ -1245,6 +1248,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Description"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr ""
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Hôtes"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1268,6 +1268,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr "All Service Checks"
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr "Exclude Handled"
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr "Hosts"
@@ -1313,6 +1316,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Description"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr "Exclude Handled"
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Hosts"
@@ -3927,7 +3933,6 @@
msgstr "No items selected - acknowledgements not sent"
#. ($services_count)
-#. (# $services_count)
msgid "ui.set.message.submittedForServices %1"
msgstr "Acknowledgements submitted for services: %1"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/it.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1200,6 +1200,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr "Tutti i controlli dei servizi associati"
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr ""
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr "Hosts"
@@ -1245,6 +1248,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Descrizione"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr ""
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Host"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/pl.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1198,6 +1198,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr ""
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr ""
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr ""
@@ -1243,6 +1246,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Opis"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr ""
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Hosty"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/sv.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-07-17 13:24:05 UTC (rev 9580)
@@ -1199,6 +1199,9 @@
msgid "ui.admin.keyword.edit.label.allServicechecks"
msgstr ""
+msgid "ui.admin.keyword.edit.label.excludeHandled"
+msgstr ""
+
msgid "ui.admin.keyword.edit.label.hosts"
msgstr ""
@@ -1244,6 +1247,9 @@
msgid "ui.admin.keyword.table.title.description"
msgstr "Beskrivning"
+msgid "ui.admin.keyword.table.title.exclude_handled"
+msgstr ""
+
msgid "ui.admin.keyword.table.title.hosts"
msgstr "Värddatorer"
Modified: trunk/opsview-web/root/admin/keyword/list_functions
===================================================================
--- trunk/opsview-web/root/admin/keyword/list_functions 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/root/admin/keyword/list_functions 2012-07-17 13:24:05 UTC (rev 9580)
@@ -10,6 +10,7 @@
<th width="110">[% c.loc("ui.admin.keyword.table.title.keyword") | html %]</th>
<th width="90" class="centered">[% c.loc("ui.admin.keyword.table.title.viewportStyle") | html %]</th>
<th width="30">[% c.loc("ui.admin.keyword.table.title.public") | html %]</th>
+<th width="30">[% c.loc("ui.admin.keyword.table.title.exclude_handled") | html %]</th>
<th>[% c.loc("ui.admin.keyword.table.title.description") | html %]</th>
<th width="40">[% c.loc("ui.admin.keyword.table.title.roles") | html %]</th>
<th width="40">[% c.loc("ui.admin.keyword.table.title.hosts") | html %]</th>
@@ -40,6 +41,17 @@
END;
END;
'</td>';
+
+ '<td class="centered">';
+ IF object.enabled;
+ IF object.exclude_handled;
+ c.loc("ui.message.yes") | html;
+ ELSE;
+ c.loc("ui.message.no") | html;
+ END;
+ END;
+ '</td>';
+
'<td>'; object.description | html; '</td>';
"<td class='centered'>";
Modified: trunk/opsview-web/root/admin/keyword/tab-keyword
===================================================================
--- trunk/opsview-web/root/admin/keyword/tab-keyword 2012-07-17 13:14:11 UTC (rev 9579)
+++ trunk/opsview-web/root/admin/keyword/tab-keyword 2012-07-17 13:24:05 UTC (rev 9580)
@@ -54,6 +54,14 @@
help_keyword => "show_contextual_menus",
);
+checkbox(
+ form_label => c.loc("ui.admin.keyword.edit.label.excludeHandled"),
+ name => "exclude_handled",
+ default => 0,
+ help_keyword => "exclude_handled",
+);
+
+
%]</div>
<script type="text/_javascript_">
showIfCheckedRadioGroup(document.main_form, "enabled", { 1:['viewport_options'] } );
