Revision 5d20c2c5
VigiBoard & modèle : correction orthographique (Acknowlege[ment] -> Acknowledge[ment]).
Corrections dans la mise à jour des événements (erreur dans la requête SQL du fait de l'interprétation stricte par PostgreSQL).
Ajout de coverage aux dépendances de test de VigiBoard.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1920 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/root.py | ||
|---|---|---|
| 96 | 96 |
aggregates.add_join((Event, CorrEvent.idcause == Event.idevent)) |
| 97 | 97 |
aggregates.add_join((aggregates.items, |
| 98 | 98 |
Event.idsupitem == aggregates.items.c.idsupitem)) |
| 99 |
aggregates.add_order_by(asc(aggregates.items.c.hostname)) |
|
| 99 | 100 |
|
| 100 | 101 |
search = {
|
| 101 | 102 |
'host': '', |
| ... | ... | |
| 402 | 403 |
@validate(validators={
|
| 403 | 404 |
"id": validators.Regex(r'^[0-9]+(,[0-9]+)*,?$'), |
| 404 | 405 |
# "trouble_ticket": validators.Regex(r'^[0-9]*$'), |
| 405 |
"status": validators.OneOf([
|
|
| 406 |
"ack": validators.OneOf([
|
|
| 406 | 407 |
u'NoChange', |
| 407 | 408 |
u'None', |
| 408 | 409 |
u'Acknowledged', |
| ... | ... | |
| 426 | 427 |
if krgv['id'] is None: |
| 427 | 428 |
flash(_('No event has been selected'), 'warning')
|
| 428 | 429 |
raise redirect(request.environ.get('HTTP_REFERER', url('/')))
|
| 429 |
ids = krgv['id'].split(',')
|
|
| 430 |
|
|
| 431 |
# Le filtre permet d'éliminer les chaines vides contenues dans le |
|
| 432 |
# tableau ('a,b,' -> split -> ['a','b',''] -> filter -> ['a','b']).
|
|
| 433 |
ids = filter(len, krgv['id'].split(','))
|
|
| 430 | 434 |
|
| 431 | 435 |
# Si des changements sont survenus depuis que la |
| 432 | 436 |
# page est affichée, on en informe l'utilisateur. |
| ... | ... | |
| 447 | 451 |
events = VigiboardRequest(User.by_user_name(username)) |
| 448 | 452 |
events.add_table(CorrEvent) |
| 449 | 453 |
events.add_join((Event, CorrEvent.idcause == Event.idevent)) |
| 450 |
events.add_join((aggregates.items,
|
|
| 454 |
events.add_join((events.items,
|
|
| 451 | 455 |
Event.idsupitem == events.items.c.idsupitem)) |
| 452 | 456 |
events.add_filter(CorrEvent.idcorrevent.in_(ids)) |
| 453 | 457 |
|
Also available in: Unified diff