Revision 348eec2c
Fix broken references to models renamed in svn rev [674].
git grep wEl 'Events|GraphGroups|Groups|HostGroups|ServiceGroups' - \
{vigiboard,models,correlator,connector,glue,vigicore} \
|xargs sed -i -re 's:\<(Event|GraphGroup|Group|HostGroup|ServiceGroup)s\>:\1:g'
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@695 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/root.py | ||
|---|---|---|
| 9 | 9 |
from pylons.controllers.util import abort |
| 10 | 10 |
from sqlalchemy import asc |
| 11 | 11 |
from vigiboard.model import DBSession |
| 12 |
from vigiboard.model import Events, EventHistory, Host, User, HostGroups
|
|
| 12 |
from vigiboard.model import Event, EventHistory, Host, User, HostGroup
|
|
| 13 | 13 |
from repoze.what.predicates import Any, not_anonymous |
| 14 | 14 |
from vigiboard.widgets.edit_event import edit_event_status_options |
| 15 | 15 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
| ... | ... | |
| 71 | 71 |
# Application des filtres si nécessaire |
| 72 | 72 |
if host : |
| 73 | 73 |
search['host'] = host |
| 74 |
events.add_filter(Events.hostname.like('%%%s%%' % host))
|
|
| 74 |
events.add_filter(Event.hostname.like('%%%s%%' % host))
|
|
| 75 | 75 |
if service : |
| 76 | 76 |
search['service'] = service |
| 77 |
events.add_filter(Events.servicename.like('%%%s%%' % service))
|
|
| 77 |
events.add_filter(Event.servicename.like('%%%s%%' % service))
|
|
| 78 | 78 |
if output : |
| 79 | 79 |
search['output'] = output |
| 80 |
events.add_filter(Events.output.like('%%%s%%' % output))
|
|
| 80 |
events.add_filter(Event.output.like('%%%s%%' % output))
|
|
| 81 | 81 |
if trouble_ticket : |
| 82 | 82 |
search['tt'] = trouble_ticket |
| 83 |
events.add_filter(Events.trouble_ticket.like(
|
|
| 83 |
events.add_filter(Event.trouble_ticket.like( |
|
| 84 | 84 |
'%%%s%%' % trouble_ticket)) |
| 85 | 85 |
|
| 86 | 86 |
# Calcul des éléments à afficher et du nombre de pages possibles |
| ... | ... | |
| 130 | 130 |
).get('repoze.who.userid')
|
| 131 | 131 |
user = User.by_user_name(username) |
| 132 | 132 |
|
| 133 |
events = DBSession.query(Events.severity, Events.idevent,
|
|
| 134 |
Events.hostname, Events.servicename
|
|
| 135 |
).join(( HostGroups , Events.hostname == HostGroups.hostname )
|
|
| 136 |
).filter(HostGroups.groupname.in_(user.groups)
|
|
| 137 |
).filter(Events.idevent == idevent)[0]
|
|
| 133 |
events = DBSession.query(Event.severity, Event.idevent,
|
|
| 134 |
Event.hostname, Event.servicename
|
|
| 135 |
).join(( HostGroup , Event.hostname == HostGroup.hostname )
|
|
| 136 |
).filter(HostGroup.groupname.in_(user.groups) |
|
| 137 |
).filter(Event.idevent == idevent)[0] |
|
| 138 | 138 |
initial_state = DBSession.query(EventHistory |
| 139 | 139 |
).filter(EventHistory.idevent == idevent |
| 140 | 140 |
).order_by(asc(EventHistory.timestamp) |
| ... | ... | |
| 182 | 182 |
""" |
| 183 | 183 |
|
| 184 | 184 |
events = VigiboardRequest() |
| 185 |
events.add_filter(Events.idevent == idevent)
|
|
| 185 |
events.add_filter(Event.idevent == idevent) |
|
| 186 | 186 |
|
| 187 | 187 |
# Vérification que l'évènement existe |
| 188 | 188 |
if events.num_rows() != 1 : |
| ... | ... | |
| 223 | 223 |
""" |
| 224 | 224 |
|
| 225 | 225 |
events = VigiboardRequest() |
| 226 |
events.add_filter(Events.hostname == host,
|
|
| 227 |
Events.servicename == service)
|
|
| 226 |
events.add_filter(Event.hostname == host, |
|
| 227 |
Event.servicename == service) |
|
| 228 | 228 |
del events.filter[2] |
| 229 | 229 |
|
| 230 | 230 |
# Vérification qu'il y a au moins 1 évènement qui correspond |
| ... | ... | |
| 275 | 275 |
ids = ids[:-1] |
| 276 | 276 |
|
| 277 | 277 |
events = VigiboardRequest() |
| 278 |
events.add_filter(Events.idevent.in_(ids))
|
|
| 278 |
events.add_filter(Event.idevent.in_(ids)) |
|
| 279 | 279 |
|
| 280 | 280 |
# Vérification que au moins un des identifiants existe et est éditable |
| 281 | 281 |
if events.num_rows() <= 0 : |
| ... | ... | |
| 289 | 289 |
).get('repoze.who.userid')
|
| 290 | 290 |
|
| 291 | 291 |
for req in events.req : |
| 292 |
if isinstance(req, Events):
|
|
| 292 |
if isinstance(req, Event): |
|
| 293 | 293 |
event = req |
| 294 | 294 |
else: |
| 295 | 295 |
event = req[0] |
Also available in: Unified diff