Revision b2346a00
Mise à jour des settings de VigiBoard pour permettre le changement de l'ordre de tri
entre l'horodatage et l'état Nagios facilement.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2617 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/vigiboardrequest.py | ||
|---|---|---|
| 8 | 8 |
from tg import url, config, tmpl_context |
| 9 | 9 |
from tg.i18n import get_lang |
| 10 | 10 |
from pylons.i18n import ugettext as _ |
| 11 |
from paste.deploy.converters import asbool |
|
| 12 |
|
|
| 11 | 13 |
from sqlalchemy import not_, and_, asc, desc |
| 12 | 14 |
from sqlalchemy.sql.expression import or_, null as expr_null, union |
| 13 | 15 |
|
| ... | ... | |
| 138 | 140 |
desc(CorrEvent.status), # État acquittement |
| 139 | 141 |
asc(StateName.statename.in_([u'OK', u'UP'])), # Vert / Pas vert |
| 140 | 142 |
priority_order, # Priorité ITIL |
| 141 |
desc(StateName.order), # Etat courant |
|
| 142 |
desc(Event.timestamp), # Timestamp |
|
| 143 | 143 |
] |
| 144 | 144 |
|
| 145 |
if asbool(config.get('state_first', True)):
|
|
| 146 |
self.orderby.extend([ |
|
| 147 |
desc(StateName.order), # Etat courant |
|
| 148 |
desc(Event.timestamp), # Timestamp |
|
| 149 |
]) |
|
| 150 |
else: |
|
| 151 |
self.orderby.extend([ |
|
| 152 |
desc(Event.timestamp), # Timestamp |
|
| 153 |
desc(StateName.order), # Etat courant |
|
| 154 |
]) |
|
| 155 |
|
|
| 156 |
|
|
| 145 | 157 |
# Regroupements (GROUP BY) |
| 146 | 158 |
# PostgreSQL est pointilleux sur les colonnes qui apparaissent |
| 147 | 159 |
# dans la clause GROUP BY. Si une colonne apparaît dans ORDER BY, |
Also available in: Unified diff