Revision e5807b6e
Renommage de la classe Access en ApplicationLog pour lui donner un caractère plus générique.
Application de la modification dans les tests, dans VigiCore et dans VigiBoard.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1549 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/vigiboard_controller.py | ||
|---|---|---|
| 10 | 10 |
from repoze.what import predicates |
| 11 | 11 |
|
| 12 | 12 |
from vigiboard.lib.base import BaseController |
| 13 |
from vigiboard.model import DBSession, Access
|
|
| 13 |
from vigiboard.model import DBSession, ApplicationLog
|
|
| 14 | 14 |
from vigiboard.controllers.error import ErrorController |
| 15 | 15 |
|
| 16 | 16 |
class VigiboardRootController(BaseController): |
| ... | ... | |
| 48 | 48 |
login_counter = request.environ['repoze.who.logins'] + 1 |
| 49 | 49 |
redirect(url('/login', came_from=came_from, __logins=login_counter))
|
| 50 | 50 |
userid = request.identity['repoze.who.userid'] |
| 51 |
Access.add_login(userid, request.remote_addr, 'Vigiboard')
|
|
| 51 |
ApplicationLog.add_login(userid, request.remote_addr, 'Vigiboard')
|
|
| 52 | 52 |
flash(_('Welcome back, %s!') % userid)
|
| 53 | 53 |
redirect(came_from) |
| 54 | 54 |
|
| ... | ... | |
| 60 | 60 |
""" |
| 61 | 61 |
# XXX Ne fonctionne pas, l'identité est déjà oubliée arrivé ici. |
| 62 | 62 |
# userid = request.identity['repoze.who.userid'] |
| 63 |
# Access.add_logout(userid, request.remote_addr, 'Vigiboard')
|
|
| 63 |
# ApplicationLog.add_logout(userid, request.remote_addr, 'Vigiboard')
|
|
| 64 | 64 |
flash(_('We hope to see you soon!'))
|
| 65 | 65 |
redirect(came_from) |
| 66 | 66 |
|
| vigiboard/model/__init__.py | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
from vigilo.models import User, UserGroup, Permission |
| 11 | 11 |
from vigilo.models import Event, EventHistory, CorrEvent |
| 12 |
from vigilo.models import Version, StateName, Access
|
|
| 12 |
from vigilo.models import Version, StateName, ApplicationLog
|
|
| 13 | 13 |
from vigilo.models import Host, HostGroup |
| 14 | 14 |
from vigilo.models import ServiceLowLevel, ServiceHighLevel, ServiceGroup |
| 15 | 15 |
from vigilo.models import ImpactedHLS, ImpactedPath |
Also available in: Unified diff