Revision f3eff455
Recherche par état d'acquittement (#813).
Permet la recherche par état d'acquittement (aucun acquittement =
nouvelle alerte, alerte prise en compte, alerte clôturée) dans VigiBoard.
Mise à jour des traductions par la même occasion.
Refs: #813.
Change-Id: Idfd7b945a6c4931bedcc531bfc18f798646fce11
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/195
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Aurelien BOMPARD <aurelien.bompard@c-s.fr>
| vigiboard/controllers/plugins/status.py | ||
|---|---|---|
| 47 | 47 |
return 4 |
| 48 | 48 |
|
| 49 | 49 |
def get_search_fields(self): |
| 50 |
options = [ |
|
| 51 |
('', l_('All alerts')),
|
|
| 52 |
('None', l_('New alerts')),
|
|
| 53 |
('Acknowledged', l_('Alerts marked as Acknowledged')),
|
|
| 54 |
('AAClosed', l_('Alerts marked as Closed')),
|
|
| 55 |
] |
|
| 56 |
|
|
| 50 | 57 |
return [ |
| 51 | 58 |
twf.TextField( |
| 52 | 59 |
'trouble_ticket', |
| 53 | 60 |
label_text=l_('Trouble Ticket'),
|
| 54 | 61 |
validator=twf.validators.String(if_missing=None), |
| 55 |
) |
|
| 62 |
), |
|
| 63 |
twf.SingleSelectField( |
|
| 64 |
'status', |
|
| 65 |
label_text=l_('Acknowledgement Status'),
|
|
| 66 |
options=options, |
|
| 67 |
validator=twf.validators.OneOf( |
|
| 68 |
dict(options).keys(), |
|
| 69 |
if_invalid=None, |
|
| 70 |
if_missing=None, |
|
| 71 |
), |
|
| 72 |
), |
|
| 56 | 73 |
] |
| 57 | 74 |
|
| 58 | 75 |
def handle_search_fields(self, query, search, state, subqueries): |
| ... | ... | |
| 62 | 79 |
if search.get('trouble_ticket'):
|
| 63 | 80 |
tt = sql_escape_like(search['trouble_ticket']) |
| 64 | 81 |
query.add_filter(CorrEvent.trouble_ticket.ilike(tt)) |
| 82 |
|
|
| 83 |
if search.get('status'):
|
|
| 84 |
query.add_filter(CorrEvent.status == search['status']) |
|
| 85 |
|
|
| vigiboard/i18n/de/LC_MESSAGES/vigiboard.po | ||
|---|---|---|
| 8 | 8 |
"Project-Id-Version: vigiboard 2.0.0\n" |
| 9 | 9 |
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
| 10 | 10 |
"POT-Creation-Date: 2010-11-19 10:22+0100\n" |
| 11 |
"PO-Revision-Date: 2011-05-19 18:25+0200\n"
|
|
| 11 |
"PO-Revision-Date: 2011-08-28 16:29+0200\n"
|
|
| 12 | 12 |
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 13 | 13 |
"Language-Team: de_DE <LL@li.org>\n" |
| 14 | 14 |
"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
| ... | ... | |
| 163 | 163 |
msgid "Group" |
| 164 | 164 |
msgstr "Gruppe" |
| 165 | 165 |
|
| 166 |
#: vigiboard/controllers/plugins/hls.py:45 |
|
| 167 |
msgid "High-Level Service" |
|
| 168 |
msgstr "" |
|
| 169 |
|
|
| 166 | 170 |
#: vigiboard/controllers/plugins/hostname.py:38 |
| 167 | 171 |
msgid "Host" |
| 168 | 172 |
msgstr "Host" |
| ... | ... | |
| 179 | 183 |
msgid "Service" |
| 180 | 184 |
msgstr "Service" |
| 181 | 185 |
|
| 186 |
#: vigiboard/controllers/plugins/status.py:51 |
|
| 187 |
msgid "All alerts" |
|
| 188 |
msgstr "" |
|
| 189 |
|
|
| 190 |
#: vigiboard/controllers/plugins/status.py:52 |
|
| 191 |
msgid "New alerts" |
|
| 192 |
msgstr "" |
|
| 193 |
|
|
| 182 | 194 |
#: vigiboard/controllers/plugins/status.py:53 |
| 195 |
msgid "Alerts marked as Acknowledged" |
|
| 196 |
msgstr "" |
|
| 197 |
|
|
| 198 |
#: vigiboard/controllers/plugins/status.py:54 |
|
| 199 |
msgid "Alerts marked as Closed" |
|
| 200 |
msgstr "" |
|
| 201 |
|
|
| 202 |
#: vigiboard/controllers/plugins/status.py:60 |
|
| 183 | 203 |
#: vigiboard/widgets/edit_event.py:58 |
| 184 | 204 |
msgid "Trouble Ticket" |
| 185 | 205 |
msgstr "Trouble Ticket" |
| 186 | 206 |
|
| 187 |
#: vigiboard/public/js/main.js:32 |
|
| 207 |
#: vigiboard/controllers/plugins/status.py:65 |
|
| 208 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 209 |
msgid "Acknowledgement Status" |
|
| 210 |
msgstr "Bestätigungsstatus" |
|
| 211 |
|
|
| 212 |
#: vigiboard/public/js/main.js:39 |
|
| 188 | 213 |
msgid "Search Event" |
| 189 | 214 |
msgstr "" |
| 190 | 215 |
|
| 191 |
#: vigiboard/public/js/main.js:47
|
|
| 216 |
#: vigiboard/public/js/main.js:54
|
|
| 192 | 217 |
msgid "Select a group" |
| 193 | 218 |
msgstr "" |
| 194 | 219 |
|
| 195 |
#: vigiboard/public/js/main.js:76 vigiboard/public/js/main.js:97
|
|
| 196 |
#: vigiboard/public/js/main.js:128
|
|
| 220 |
#: vigiboard/public/js/main.js:84 vigiboard/public/js/main.js:105
|
|
| 221 |
#: vigiboard/public/js/main.js:136
|
|
| 197 | 222 |
msgid "Unable to save preferences" |
| 198 | 223 |
msgstr "" |
| 199 | 224 |
|
| ... | ... | |
| 223 | 248 |
"Warnung: die Änderung des Tickets wirkt sich auf alle ausgewählten " |
| 224 | 249 |
"Ereignisse aus." |
| 225 | 250 |
|
| 226 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 227 |
msgid "Acknowledgement Status" |
|
| 228 |
msgstr "Bestätigungsstatus" |
|
| 229 |
|
|
| 230 | 251 |
#: vigiboard/widgets/search_form.py:55 |
| 231 | 252 |
msgid "Search" |
| 232 | 253 |
msgstr "Suchen" |
| vigiboard/i18n/en/LC_MESSAGES/vigiboard.po | ||
|---|---|---|
| 6 | 6 |
# |
| 7 | 7 |
msgid "" |
| 8 | 8 |
msgstr "" |
| 9 |
"Project-Id-Version: vigilo-vigiboard 2.0.1\n"
|
|
| 9 |
"Project-Id-Version: vigilo-vigiboard 2.0.5\n"
|
|
| 10 | 10 |
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n" |
| 11 |
"POT-Creation-Date: 2011-05-19 18:25+0200\n"
|
|
| 12 |
"PO-Revision-Date: 2011-05-19 18:25+0200\n"
|
|
| 11 |
"POT-Creation-Date: 2011-08-28 16:29+0200\n"
|
|
| 12 |
"PO-Revision-Date: 2011-08-28 16:29+0200\n"
|
|
| 13 | 13 |
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 14 | 14 |
"Language-Team: en <LL@li.org>\n" |
| 15 | 15 |
"Plural-Forms: nplurals=2; plural=(n != 1)\n" |
| ... | ... | |
| 168 | 168 |
msgid "Group" |
| 169 | 169 |
msgstr "Group" |
| 170 | 170 |
|
| 171 |
#: vigiboard/controllers/plugins/hls.py:45 |
|
| 172 |
msgid "High-Level Service" |
|
| 173 |
msgstr "High-Level Service" |
|
| 174 |
|
|
| 171 | 175 |
#: vigiboard/controllers/plugins/hostname.py:38 |
| 172 | 176 |
msgid "Host" |
| 173 | 177 |
msgstr "Host" |
| ... | ... | |
| 184 | 188 |
msgid "Service" |
| 185 | 189 |
msgstr "Service" |
| 186 | 190 |
|
| 191 |
#: vigiboard/controllers/plugins/status.py:51 |
|
| 192 |
msgid "All alerts" |
|
| 193 |
msgstr "All alerts" |
|
| 194 |
|
|
| 195 |
#: vigiboard/controllers/plugins/status.py:52 |
|
| 196 |
msgid "New alerts" |
|
| 197 |
msgstr "New alerts" |
|
| 198 |
|
|
| 187 | 199 |
#: vigiboard/controllers/plugins/status.py:53 |
| 200 |
msgid "Alerts marked as Acknowledged" |
|
| 201 |
msgstr "Alerts marked as Acknowledged" |
|
| 202 |
|
|
| 203 |
#: vigiboard/controllers/plugins/status.py:54 |
|
| 204 |
msgid "Alerts marked as Closed" |
|
| 205 |
msgstr "Alerts marked as Closed" |
|
| 206 |
|
|
| 207 |
#: vigiboard/controllers/plugins/status.py:60 |
|
| 188 | 208 |
#: vigiboard/widgets/edit_event.py:58 |
| 189 | 209 |
msgid "Trouble Ticket" |
| 190 | 210 |
msgstr "Trouble Ticket" |
| 191 | 211 |
|
| 192 |
#: vigiboard/public/js/main.js:32 |
|
| 212 |
#: vigiboard/controllers/plugins/status.py:65 |
|
| 213 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 214 |
msgid "Acknowledgement Status" |
|
| 215 |
msgstr "Acknowledgement Status" |
|
| 216 |
|
|
| 217 |
#: vigiboard/public/js/main.js:39 |
|
| 193 | 218 |
msgid "Search Event" |
| 194 | 219 |
msgstr "Search Event" |
| 195 | 220 |
|
| 196 |
#: vigiboard/public/js/main.js:47
|
|
| 221 |
#: vigiboard/public/js/main.js:54
|
|
| 197 | 222 |
msgid "Select a group" |
| 198 | 223 |
msgstr "Select a group" |
| 199 | 224 |
|
| 200 |
#: vigiboard/public/js/main.js:76 vigiboard/public/js/main.js:97
|
|
| 201 |
#: vigiboard/public/js/main.js:128
|
|
| 225 |
#: vigiboard/public/js/main.js:84 vigiboard/public/js/main.js:105
|
|
| 226 |
#: vigiboard/public/js/main.js:136
|
|
| 202 | 227 |
msgid "Unable to save preferences" |
| 203 | 228 |
msgstr "Unable to save preferences" |
| 204 | 229 |
|
| ... | ... | |
| 226 | 251 |
msgid "Warning: changing the ticket will affect all selected events." |
| 227 | 252 |
msgstr "Warning: changing the ticket will affect all selected events." |
| 228 | 253 |
|
| 229 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 230 |
msgid "Acknowledgement Status" |
|
| 231 |
msgstr "Acknowledgement Status" |
|
| 232 |
|
|
| 233 | 254 |
#: vigiboard/widgets/search_form.py:55 |
| 234 | 255 |
msgid "Search" |
| 235 | 256 |
msgstr "Search" |
| vigiboard/i18n/fr/LC_MESSAGES/vigiboard.po | ||
|---|---|---|
| 8 | 8 |
"Project-Id-Version: vigiboard 0.1\n" |
| 9 | 9 |
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
| 10 | 10 |
"POT-Creation-Date: 2009-07-06 11:19+0200\n" |
| 11 |
"PO-Revision-Date: 2011-05-19 18:25+0200\n"
|
|
| 11 |
"PO-Revision-Date: 2011-08-28 16:29+0200\n"
|
|
| 12 | 12 |
"Last-Translator: Thomas ANDREJAK <thomas.andrejak@c-s.fr>\n" |
| 13 | 13 |
"Language-Team: fr_FR <LL@li.org>\n" |
| 14 | 14 |
"Plural-Forms: nplurals=2; plural=(n > 1)\n" |
| ... | ... | |
| 77 | 77 |
"User \"%(user)s\" (%(address)s) changed the trouble ticket from " |
| 78 | 78 |
"\"%(previous)s\" to \"%(new)s\" on event #%(idevent)d" |
| 79 | 79 |
msgstr "" |
| 80 |
"L'utilisateur \"%(user)s\" (%(address)s) a changé le ticket d'incident " |
|
| 81 |
"de l'événement n°%(idevent)d de \"%(previous)s\" vers \"%(new)s\""
|
|
| 80 |
"L'utilisateur \"%(user)s\" (%(address)s) a changé le ticket d'incident de"
|
|
| 81 |
" l'événement n°%(idevent)d de \"%(previous)s\" vers \"%(new)s\"" |
|
| 82 | 82 |
|
| 83 | 83 |
#: vigiboard/controllers/root.py:617 |
| 84 | 84 |
#, python-format |
| 85 | 85 |
msgid "User \"%(user)s\" (%(address)s) forcefully closed event #%(idevent)d" |
| 86 |
msgstr "L'utilisateur \"%(user)s\" (%(address)s) a forcé la fermeture de l'événement #%(idevent)d" |
|
| 86 |
msgstr "" |
|
| 87 |
"L'utilisateur \"%(user)s\" (%(address)s) a forcé la fermeture de " |
|
| 88 |
"l'événement #%(idevent)d" |
|
| 87 | 89 |
|
| 88 | 90 |
#: vigiboard/controllers/root.py:637 |
| 89 | 91 |
#, python-format |
| ... | ... | |
| 167 | 169 |
msgid "Group" |
| 168 | 170 |
msgstr "Groupe" |
| 169 | 171 |
|
| 172 |
#: vigiboard/controllers/plugins/hls.py:45 |
|
| 173 |
msgid "High-Level Service" |
|
| 174 |
msgstr "Service de Haut Niveau" |
|
| 175 |
|
|
| 170 | 176 |
#: vigiboard/controllers/plugins/hostname.py:38 |
| 171 | 177 |
msgid "Host" |
| 172 | 178 |
msgstr "Hôte" |
| ... | ... | |
| 183 | 189 |
msgid "Service" |
| 184 | 190 |
msgstr "Service" |
| 185 | 191 |
|
| 192 |
#: vigiboard/controllers/plugins/status.py:51 |
|
| 193 |
msgid "All alerts" |
|
| 194 |
msgstr "Toutes les alertes" |
|
| 195 |
|
|
| 196 |
#: vigiboard/controllers/plugins/status.py:52 |
|
| 197 |
msgid "New alerts" |
|
| 198 |
msgstr "Nouvelles alertes" |
|
| 199 |
|
|
| 186 | 200 |
#: vigiboard/controllers/plugins/status.py:53 |
| 201 |
msgid "Alerts marked as Acknowledged" |
|
| 202 |
msgstr "Alertes « Prises en compte »" |
|
| 203 |
|
|
| 204 |
#: vigiboard/controllers/plugins/status.py:54 |
|
| 205 |
msgid "Alerts marked as Closed" |
|
| 206 |
msgstr "Alertes « Fermées »" |
|
| 207 |
|
|
| 208 |
#: vigiboard/controllers/plugins/status.py:60 |
|
| 187 | 209 |
#: vigiboard/widgets/edit_event.py:58 |
| 188 | 210 |
msgid "Trouble Ticket" |
| 189 | 211 |
msgstr "Ticket d'incident" |
| 190 | 212 |
|
| 191 |
#: vigiboard/public/js/main.js:32 |
|
| 213 |
#: vigiboard/controllers/plugins/status.py:65 |
|
| 214 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 215 |
msgid "Acknowledgement Status" |
|
| 216 |
msgstr "Statut d'acquittement" |
|
| 217 |
|
|
| 218 |
#: vigiboard/public/js/main.js:39 |
|
| 192 | 219 |
msgid "Search Event" |
| 193 | 220 |
msgstr "Rechercher l'événement" |
| 194 | 221 |
|
| 195 |
#: vigiboard/public/js/main.js:47
|
|
| 222 |
#: vigiboard/public/js/main.js:54
|
|
| 196 | 223 |
msgid "Select a group" |
| 197 | 224 |
msgstr "Choisir un groupe" |
| 198 | 225 |
|
| 199 |
#: vigiboard/public/js/main.js:76 vigiboard/public/js/main.js:97
|
|
| 200 |
#: vigiboard/public/js/main.js:128
|
|
| 226 |
#: vigiboard/public/js/main.js:84 vigiboard/public/js/main.js:105
|
|
| 227 |
#: vigiboard/public/js/main.js:136
|
|
| 201 | 228 |
msgid "Unable to save preferences" |
| 202 | 229 |
msgstr "Impossible de sauvegarder les préférences" |
| 203 | 230 |
|
| ... | ... | |
| 225 | 252 |
msgid "Warning: changing the ticket will affect all selected events." |
| 226 | 253 |
msgstr "Attention : la modification du ticket affectera toute la sélection." |
| 227 | 254 |
|
| 228 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 229 |
msgid "Acknowledgement Status" |
|
| 230 |
msgstr "Statut d'acquittement" |
|
| 231 |
|
|
| 232 | 255 |
#: vigiboard/widgets/search_form.py:55 |
| 233 | 256 |
msgid "Search" |
| 234 | 257 |
msgstr "Rechercher" |
| vigiboard/i18n/vigiboard.pot | ||
|---|---|---|
| 7 | 7 |
#, fuzzy |
| 8 | 8 |
msgid "" |
| 9 | 9 |
msgstr "" |
| 10 |
"Project-Id-Version: vigilo-vigiboard 2.0.1\n"
|
|
| 10 |
"Project-Id-Version: vigilo-vigiboard 2.0.5\n"
|
|
| 11 | 11 |
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n" |
| 12 |
"POT-Creation-Date: 2011-05-19 18:25+0200\n"
|
|
| 12 |
"POT-Creation-Date: 2011-08-28 16:29+0200\n"
|
|
| 13 | 13 |
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 14 | 14 |
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 15 | 15 |
"Language-Team: LANGUAGE <LL@li.org>\n" |
| ... | ... | |
| 162 | 162 |
msgid "Group" |
| 163 | 163 |
msgstr "" |
| 164 | 164 |
|
| 165 |
#: vigiboard/controllers/plugins/hls.py:45 |
|
| 166 |
msgid "High-Level Service" |
|
| 167 |
msgstr "" |
|
| 168 |
|
|
| 165 | 169 |
#: vigiboard/controllers/plugins/hostname.py:38 |
| 166 | 170 |
msgid "Host" |
| 167 | 171 |
msgstr "" |
| ... | ... | |
| 178 | 182 |
msgid "Service" |
| 179 | 183 |
msgstr "" |
| 180 | 184 |
|
| 181 |
#: vigiboard/controllers/plugins/status.py:53 vigiboard/widgets/edit_event.py:58 |
|
| 185 |
#: vigiboard/controllers/plugins/status.py:51 |
|
| 186 |
msgid "All alerts" |
|
| 187 |
msgstr "" |
|
| 188 |
|
|
| 189 |
#: vigiboard/controllers/plugins/status.py:52 |
|
| 190 |
msgid "New alerts" |
|
| 191 |
msgstr "" |
|
| 192 |
|
|
| 193 |
#: vigiboard/controllers/plugins/status.py:53 |
|
| 194 |
msgid "Alerts marked as Acknowledged" |
|
| 195 |
msgstr "" |
|
| 196 |
|
|
| 197 |
#: vigiboard/controllers/plugins/status.py:54 |
|
| 198 |
msgid "Alerts marked as Closed" |
|
| 199 |
msgstr "" |
|
| 200 |
|
|
| 201 |
#: vigiboard/controllers/plugins/status.py:60 vigiboard/widgets/edit_event.py:58 |
|
| 182 | 202 |
msgid "Trouble Ticket" |
| 183 | 203 |
msgstr "" |
| 184 | 204 |
|
| 185 |
#: vigiboard/public/js/main.js:32 |
|
| 205 |
#: vigiboard/controllers/plugins/status.py:65 vigiboard/widgets/edit_event.py:61 |
|
| 206 |
msgid "Acknowledgement Status" |
|
| 207 |
msgstr "" |
|
| 208 |
|
|
| 209 |
#: vigiboard/public/js/main.js:39 |
|
| 186 | 210 |
msgid "Search Event" |
| 187 | 211 |
msgstr "" |
| 188 | 212 |
|
| 189 |
#: vigiboard/public/js/main.js:47
|
|
| 213 |
#: vigiboard/public/js/main.js:54
|
|
| 190 | 214 |
msgid "Select a group" |
| 191 | 215 |
msgstr "" |
| 192 | 216 |
|
| 193 |
#: vigiboard/public/js/main.js:76 vigiboard/public/js/main.js:97
|
|
| 194 |
#: vigiboard/public/js/main.js:128
|
|
| 217 |
#: vigiboard/public/js/main.js:84 vigiboard/public/js/main.js:105
|
|
| 218 |
#: vigiboard/public/js/main.js:136
|
|
| 195 | 219 |
msgid "Unable to save preferences" |
| 196 | 220 |
msgstr "" |
| 197 | 221 |
|
| ... | ... | |
| 219 | 243 |
msgid "Warning: changing the ticket will affect all selected events." |
| 220 | 244 |
msgstr "" |
| 221 | 245 |
|
| 222 |
#: vigiboard/widgets/edit_event.py:61 |
|
| 223 |
msgid "Acknowledgement Status" |
|
| 224 |
msgstr "" |
|
| 225 |
|
|
| 226 | 246 |
#: vigiboard/widgets/search_form.py:55 |
| 227 | 247 |
msgid "Search" |
| 228 | 248 |
msgstr "" |
Also available in: Unified diff