Project

General

Profile

Revision 0f56fff9

ID0f56fff9b58e9d405450d8f3e8411b4179737243
Parent 0e24cd14
Child 6c664a14

Added by Francois POIROTTE over 14 years ago

Migration des settings de deploiement depuis vigi*_cfg.py vers le fichier INI correspondant.
Ajout d'un patch pour PasteDeploy qui permet de gérer les échapements dans l'interpolation.
Ticket associé: http://trac.pythonpaste.org/pythonpaste/ticket/379

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

View differences:

vigiboard/controllers/root.py
39 39
    @expose('vigiboard.templates.vigiboard')
40 40
    @require(Any(not_anonymous(), msg="You need to be authenticated"))
41 41
    def default(self, page = None, host = None, service = None, output = None,
42
            trouble_ticket=None,*argv,**krgv):
42
            trouble_ticket=None, *argv, **krgv):
43 43
            
44 44
        """
45 45
        Page d'accueil de Vigiboard. Elle affiche, suivant la page demandée (page 1 par
......
133 133
        events = DBSession.query(Events.severity, Events.idevent,
134 134
                        Events.hostname, Events.servicename
135 135
                 ).join(( HostGroups , Events.hostname == HostGroups.hostname )
136
                 ).filter(HostGroups.groupname.in_(user.groups())
136
                 ).filter(HostGroups.groupname.in_(user.groups)
137 137
                 ).filter(Events.idevent == idevent)[0]
138 138
        initial_state = DBSession.query(EventHistory
139 139
                 ).filter(EventHistory.idevent == idevent
......
146 146
                    break
147 147
        else :
148 148
            initial_state = 0
149
        
149

  
150 150
        severity = { 0: _('None'), 1: _('OK'), 2: _('Suppressed'),
151 151
                3: _('Initial'), 4: _('Maintenance'), 5: _('Minor'),
152 152
                6: _('Major'), 7: _('Critical') }
......
315 315

  
316 316

  
317 317
    @validate(validators={"plugin_name":validators.OneOf(
318
        [i for [i,j] in config['vigiboard_plugins']])},
318
        [i for [i,j] in config.get('vigiboard_plugins', [])])},
319 319
                error_handler = process_form_errors)
320 320
    @expose('json')
321 321
    def get_plugin_value(self, plugin_name, *arg, **krgv):
322 322
        """
323 323
        Permet aux plugins de pouvoir récupérer des valeurs Json
324 324
        """
325
        plugin = [i for i in config['vigiboard_plugins'] \
326
                            if i[0] == plugin_name][0]
325
        plugins = config['vigiboard_plugins']
326
        if plugins is None:
327
            return
328

  
329
        plugin = [i for i in plugins if i[0] == plugin_name][0]
327 330
        try:
328 331
            mypac = __import__(
329 332
                'vigiboard.controllers.vigiboard_plugin.' + plugin[0],

Also available in: Unified diff