Revision 4952a19c
Correction du contrôleur principal.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1112 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/root.py | ||
|---|---|---|
| 14 | 14 |
from vigiboard.model import DBSession |
| 15 | 15 |
from vigiboard.model import Event, EventHistory, EventsAggregate, \ |
| 16 | 16 |
Host, HostGroup, \ |
| 17 |
State, User |
|
| 17 |
State, Statename, User
|
|
| 18 | 18 |
from repoze.what.predicates import Any, not_anonymous |
| 19 | 19 |
from vigiboard.widgets.edit_event import edit_event_status_options |
| 20 | 20 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
| ... | ... | |
| 72 | 72 |
page = 1 |
| 73 | 73 |
|
| 74 | 74 |
username = request.environ['repoze.who.identity']['repoze.who.userid'] |
| 75 |
aggregates = VigiboardRequest(User.by_user_name(username)) |
|
| 75 |
user = User.by_user_name(username) |
|
| 76 |
aggregates = VigiboardRequest(user) |
|
| 76 | 77 |
|
| 77 | 78 |
search = {
|
| 78 | 79 |
'host': '', |
| ... | ... | |
| 181 | 182 |
} |
| 182 | 183 |
|
| 183 | 184 |
return dict( |
| 184 |
current_state = event[1].current_state, |
|
| 185 |
initial_state = event[1].initial_state, |
|
| 186 |
peak_state = event[1].peak_state, |
|
| 185 |
current_state = Statename.value_to_statename( |
|
| 186 |
event[1].current_state), |
|
| 187 |
initial_state = Statename.value_to_statename( |
|
| 188 |
event[1].initial_state), |
|
| 189 |
peak_state = Statename.value_to_statename( |
|
| 190 |
event[1].peak_state), |
|
| 187 | 191 |
idaggregate = idaggregate, |
| 188 | 192 |
host = event[1].hostname, |
| 189 | 193 |
service = event[1].servicename, |
Also available in: Unified diff