/ - Diff - Vigiboard - UNITY 360

Revision e307e626

ID	e307e62688fd282d34b6ec729457ce61b4fec04e
Parent	01ddeed2
Child	2f100e5f

Added by Francois POIROTTE about 14 years ago

Suppression du !BaseController spécifique de l'application (utilisation de celui dans vigilo.turbogears.controllers).
Utilisation de schémas de validation !FormEncode dans le contrôleur principal (en remplacement des validateurs individuels, plus limités).

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2808 b22e2e97-25c9-44ff-b637-2e5ceca36478

     from sqlalchemy import asc
     from sqlalchemy.sql import func
     from repoze.what.predicates import Any, not_anonymous
     from formencode import validators, schema
     from vigilo.models.session import DBSession
     from vigilo.models.tables import Event, EventHistory, CorrEvent, Host, \
-...
     from vigilo.models.functions import sql_escape_like
     from vigilo.models.tables.secondary_tables import EVENTSAGGREGATE_TABLE
     from vigilo.turbogears.controllers.autocomplete \
         import make_autocomplete_controller
     from vigilo.turbogears.controllers.autocomplete import AutoCompleteController
     from vigilo.turbogears.helpers import get_current_user
     from vigiboard.controllers.vigiboardrequest import VigiboardRequest
     from vigiboard.controllers.vigiboard_controller import VigiboardRootController
     from vigiboard.widgets.edit_event import edit_event_status_options
     from vigiboard.lib.base import BaseController
     __all__ = ('RootController', 'get_last_modification_timestamp',
                'date_to_timestamp')
-...
         """
         Le controller général de vigiboard
         """
         autocomplete = make_autocomplete_controller(BaseController)
         autocomplete = AutoCompleteController()
         def process_form_errors(self, *argv, **kwargv):
             """
-...
                 flash("'%s': %s" % (k, tmpl_context.form_errors[k]), 'error')
             redirect(request.environ.get('HTTP_REFERER', '/'))
         @validate(validators={
                 'page': validators.Int(min=1),
             }, error_handler = process_form_errors)
         class DefaultSchema(schema.Schema):
             page = validators.Int(min=1, if_missing=1, if_invalid=1)
             supitemgroup = validators.String(if_missing=None)
             host = validators.String(if_missing=None)
             service = validators.String(if_missing=None)
             output = validators.String(if_missing=None)
             trouble_ticket = validators.String(if_missing=None)
             from_date = validators.String(if_missing=None)
             to_date = validators.String(if_missing=None)
         @validate(
             validators=DefaultSchema(),
             error_handler = process_form_errors)
         @expose('events_table.html')
         @require(Any(not_anonymous(), msg=l_("You need to be authenticated")))
         def default(self, page=1, supitemgroup=None,
                 host=None, service=None, output=None, trouble_ticket=None,
                 from_date=None, to_date=None, *argv, **krgv):
         def default(self, page, supitemgroup, host, service,
                     output, trouble_ticket, from_date, to_date):
             """
             Page d'accueil de Vigiboard. Elle affiche, suivant la page demandée
             (page 1 par defaut), la liste des événements, rangés par ordre de prise
-...
             - VIGILO_EXIG_VIGILO_BAC_0070,
             - VIGILO_EXIG_VIGILO_BAC_0100,
             """
             if not page:
                 page = 1
             user = get_current_user()
             aggregates = VigiboardRequest(user)
             aggregates.add_table(
-...
                 refresh_times = config['vigiboard_refresh_times'],
+            )
         @validate(validators={
                 'idcorrevent': validators.Int(not_empty=True),
                 'page': validators.Int(min=1),
             }, error_handler = process_form_errors)
         class MaskedEventsSchema(schema.Schema):
             idcorrevent = validators.Int(not_empty=True)
             page = validators.Int(min=1, if_missing=1, if_invalid=1)
         @validate(
             validators=MaskedEventsSchema(),
             error_handler = process_form_errors)
         @expose('raw_events_table.html')
         @require(Any(not_anonymous(), msg=l_("You need to be authenticated")))
         def masked_events(self, idcorrevent, page=1):
         def masked_events(self, idcorrevent, page):
             """
             Affichage de la liste des événements bruts masqués dans un
             événement corrélé (agrégés).
             @param idevent: identifiant de l'événement souhaité
             """
             if not page:
                 page = 1
             user = get_current_user()
             # Récupère la liste des événements masqués de l'événement
-...
                refresh_times=config['vigiboard_refresh_times'],
+            )
         @validate(validators={
                 'idevent': validators.Int(not_empty=True),
                 'page': validators.Int(min=1),
             }, error_handler = process_form_errors)
         class EventSchema(schema.Schema):
             idevent = validators.Int(not_empty=True)
             page = validators.Int(min=1, if_missing=1, if_invalid=1)
         @validate(
             validators=EventSchema(),
             error_handler = process_form_errors)
         @expose('history_table.html')
         @require(Any(not_anonymous(), msg=l_("You need to be authenticated")))
         def event(self, idevent, page=1):
         def event(self, idevent, page):
             """
             Affichage de l'historique d'un événement brut.
             Pour accéder à cette page, l'utilisateur doit être authentifié.
-...
                refresh_times=config['vigiboard_refresh_times'],
+            )
         class ItemSchema(schema.Schema):
             page = validators.Int(min=1, if_missing=1, if_invalid=1)
             host = validators.String(not_empty=True)
             service = validators.String(if_missing=None)
         @validate(
             validators={
                 'host': validators.NotEmpty(),
     #            'service': validators.NotEmpty(),
                 'page': validators.Int(min=1),
             },
             validators=ItemSchema(),
             error_handler = process_form_errors)
         @expose('events_table.html')
         @require(Any(not_anonymous(), msg=l_("You need to be authenticated")))
         def item(self, page, host, service=None):
         def item(self, page, host, service):
             """
             Affichage de l'historique de l'ensemble des événements corrélés
             jamais ouverts sur l'hôte / service demandé.
-...
                 refresh_times=config['vigiboard_refresh_times'],
+            )
         @validate(validators={
             "id": validators.Regex(r'^[0-9]+(,[0-9]+)*,?$'),
             "last_modification": validators.Number(not_empty=True),
             "trouble_ticket": validators.String(if_missing=''),
             "ack": validators.OneOf([
         class UpdateSchema(schema.Schema):
             id = validators.Regex(r'^[0-9]+(,[0-9]+)*,?$')
             last_modification = validators.Number(not_empty=True)
             trouble_ticket = validators.String(if_missing='')
             ack = validators.OneOf([
                 u'NoChange',
                 u'None',
                 u'Acknowledged',
                 u'AAClosed'
             ], not_empty=True)}, error_handler = process_form_errors)
             ], not_empty=True)
         @validate(
             validators=UpdateSchema(),
             error_handler = process_form_errors)
         @require(Any(not_anonymous(), msg=l_("You need to be authenticated")))
         @expose()
         def update(self, id, last_modification, trouble_ticket, ack):
-...
             flash(_('Updated successfully'))
             redirect(request.environ.get('HTTP_REFERER', '/'))
         @validate(validators={
             "plugin_name": validators.OneOf([i[0] for i \
                 in config.get('vigiboard_plugins', [])]),
             'idcorrevent': validators.Int(not_empty=True),
             }, error_handler=process_form_errors)
         class GetPluginValueSchema(schema.Schema):
             idcorrevent = validators.Int(not_empty=True)
             plugin_name = validators.OneOf(
                 i[0] for i in config.get('vigiboard_plugins', []))
             # Permet de passer des paramètres supplémentaires au plugin.
             allow_extra_fields = True
         @validate(
             validators=GetPluginValueSchema(),
             error_handler = process_form_errors)
         @expose('json')
         @require(Any(not_anonymous(), msg=l_("You need to be authenticated")))
         def get_plugin_value(self, idcorrevent, plugin_name, *arg, **krgv):

     # -*- coding: utf-8 -*-
     """Fallback controller."""
     from vigiboard.lib.base import BaseController
     from vigilo.turbogears.controllers import BaseController
     from tg import expose
     __all__ = ['TemplateController']

     from tg import expose, flash, request, redirect
     from pylons.i18n import ugettext as _
     from vigiboard.lib.base import BaseController
     from vigilo.turbogears.controllers import BaseController
     from vigiboard.controllers.error import ErrorController
     LOGGER = logging.getLogger(__name__)

     # -*- coding: utf-8 -*-
     """The base Controller API."""
     from tg import TGController, tmpl_context
     from tg.render import render
     from tg import request
     from pylons.i18n import _, ungettext, N_
     from tw.api import WidgetBunch
     __all__ = ['Controller', 'BaseController']
     class BaseController(TGController):
         """
         Base class for the controllers in the application.
         Your web application should have one of these. The root of
         your application is used to compute URLs used by your app.
         """
         def __call__(self, environ, start_response):
             """Invoke the Controller"""
             # TGController.__call__ dispatches to the Controller method
             # the request is routed to. This routing information is
             # available in environ['pylons.routes_dict']
             request.identity = request.environ.get('repoze.who.identity')
             tmpl_context.identity = request.identity
             return TGController.__call__(self, environ, start_response)

Also available in: Unified diff

Project

General

Profile

Revision e307e626