Revision bc2d4167
Suppression du !BaseController spécifique de VigiGraph (utilisation du générique fourni par vigilo.turbogears).
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2810 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigigraph/controllers/root.py | ||
|---|---|---|
| 7 | 7 |
from pylons.i18n import ugettext as _ |
| 8 | 8 |
from repoze.what.predicates import Any, not_anonymous |
| 9 | 9 |
|
| 10 |
from vigigraph.lib.base import BaseController
|
|
| 10 |
from vigilo.turbogears.controllers import BaseController
|
|
| 11 | 11 |
from vigigraph.controllers.error import ErrorController |
| 12 | 12 |
from vigigraph.controllers.rpc import RpcController |
| 13 |
from vigilo.turbogears.controllers.proxy import make_proxy_controller
|
|
| 13 |
from vigilo.turbogears.controllers.proxy import ProxyController
|
|
| 14 | 14 |
|
| 15 | 15 |
__all__ = ['RootController'] |
| 16 | 16 |
|
| ... | ... | |
| 23 | 23 |
""" |
| 24 | 24 |
error = ErrorController() |
| 25 | 25 |
rpc = RpcController() |
| 26 |
nagios = make_proxy_controller(BaseController, 'nagios', '/nagios/')
|
|
| 27 |
rrdgraph = make_proxy_controller(BaseController, 'rrdgraph', '/rrdgraph/')
|
|
| 26 |
nagios = ProxyController('nagios', '/nagios/')
|
|
| 27 |
rrdgraph = ProxyController('rrdgraph', '/rrdgraph/')
|
|
| 28 | 28 |
|
| 29 | 29 |
@expose('index.html')
|
| 30 | 30 |
@require(Any(not_anonymous(), msg=_("You need to be authenticated")))
|
| vigigraph/controllers/rpc.py | ||
|---|---|---|
| 21 | 21 |
from sqlalchemy.orm import aliased |
| 22 | 22 |
from sqlalchemy import or_ |
| 23 | 23 |
|
| 24 |
from vigigraph.lib.base import BaseController |
|
| 24 |
from vigilo.turbogears.controllers import BaseController |
|
| 25 |
from vigilo.turbogears.helpers import get_current_user |
|
| 25 | 26 |
|
| 26 | 27 |
from vigilo.models.session import DBSession |
| 27 | 28 |
from vigilo.models.tables import LowLevelService, Host, User |
| ... | ... | |
| 36 | 37 |
from vigilo.models.tables.secondary_tables import GRAPH_PERFDATASOURCE_TABLE |
| 37 | 38 |
from vigilo.models.functions import sql_escape_like |
| 38 | 39 |
|
| 39 |
from vigilo.turbogears.helpers import get_current_user |
|
| 40 |
|
|
| 41 | 40 |
from vigigraph.widgets.searchhostform import SearchHostForm |
| 42 | 41 |
|
| 43 | 42 |
LOGGER = logging.getLogger(__name__) |
| vigigraph/controllers/template.py | ||
|---|---|---|
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
"""Fallback controller.""" |
| 3 | 3 |
|
| 4 |
from vigigraph.lib.base import BaseController
|
|
| 4 |
from vigilo.turbogears.controllers import BaseController
|
|
| 5 | 5 |
|
| 6 | 6 |
__all__ = ['TemplateController'] |
| 7 | 7 |
|
| vigigraph/lib/base.py | ||
|---|---|---|
| 1 |
# -*- coding: utf-8 -*- |
|
| 2 |
|
|
| 3 |
"""The base Controller API.""" |
|
| 4 |
|
|
| 5 |
from tg import TGController, tmpl_context |
|
| 6 |
from tg.render import render |
|
| 7 |
from tg import request |
|
| 8 |
from pylons.i18n import _, ungettext, N_ |
|
| 9 |
from tw.api import WidgetBunch |
|
| 10 |
|
|
| 11 |
__all__ = ['Controller', 'BaseController'] |
|
| 12 |
|
|
| 13 |
|
|
| 14 |
class BaseController(TGController): |
|
| 15 |
""" |
|
| 16 |
Base class for the controllers in the application. |
|
| 17 |
|
|
| 18 |
Your web application should have one of these. The root of |
|
| 19 |
your application is used to compute URLs used by your app. |
|
| 20 |
|
|
| 21 |
""" |
|
| 22 |
|
|
| 23 |
def __call__(self, environ, start_response): |
|
| 24 |
"""Invoke the Controller""" |
|
| 25 |
# TGController.__call__ dispatches to the Controller method |
|
| 26 |
# the request is routed to. This routing information is |
|
| 27 |
# available in environ['pylons.routes_dict'] |
|
| 28 |
|
|
| 29 |
request.identity = request.environ.get('repoze.who.identity')
|
|
| 30 |
tmpl_context.identity = request.identity |
|
| 31 |
return TGController.__call__(self, environ, start_response) |
|
Also available in: Unified diff