Project

General

Profile

Revision 693e96f1

ID693e96f14bcfcee4f0c42e0619adf0347901063b
Parent 477d2eb1
Child a2d3e48e

Added by Thomas ANDREJAK over 14 years ago

Ajout du refresh dans la toolbar et correction CSS / W3C

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

View differences:

vigiboard/controllers/root.py
5 5
import tg
6 6

  
7 7
from tg import config, expose, flash, require, request, redirect, \
8
                validate, tmpl_context
8
                validate, tmpl_context, session
9 9

  
10 10
from tw.forms import validators 
11 11

  
......
71 71
        @param output: Idem que host mais sur le text explicatif
72 72
        @param trouble_ticket: Idem que host mais sur les tickets attribués
73 73
        """
74

  
74 75
        if page < 1 :
75 76
            page = 1
76 77

  
77 78
        events = VigiboardRequest()
78 79
        
79
        search = 0
80
        search = {'host':'', 'service':'', 'output':'', 'tt':''}
80 81
        # Application des filtres si nécessaire
81 82
        if host :
82
            search = 1
83
            search['host'] = host
83 84
            events.add_filter(Events.hostname.like('%%%s%%' % host))
84 85
        if service :
85
            search = 1
86
            search['service'] = service
86 87
            events.add_filter(Events.servicename.like('%%%s%%' % service))
87 88
        if output :
88
            search = 1
89
            search['output'] = output
89 90
            events.add_filter(Events.output.like('%%%s%%' % output))
90 91
        if trouble_ticket :
91
            search = 1
92
            search['tt'] = trouble_ticket
92 93
            events.add_filter(Events.trouble_ticket.like(
93 94
                '%%%s%%' % trouble_ticket))
94 95

  
......
104 105

  
105 106
        events.format_events(id_first_row, id_last_row)
106 107
        events.generate_tmpl_context() 
107

  
108 108
        return dict(
109 109
               events = events.events,
110 110
               id_first_row = id_first_row + 1,
......
117 117
               hist_error = False,
118 118
               plugin_context = events.context_fct,
119 119
               search = search
120
               
120 121
            )
121
       
122
      
122 123
    @validate(validators={'idevent':validators.Int(not_empty=True)},
123 124
            error_handler=process_form_errors)
124 125
    @expose('json')
......
132 133

  
133 134
        @param id: identifiant de l'évènement
134 135
        """
135
        
136

  
136 137
        # Obtention de données sur l'évènement et sur son historique
137 138
        events = DBSession.query(Events.severity, Events.idevent,
138 139
                        Events.hostname, Events.servicename
139 140
                 ).join(( HostGroups , Events.hostname == HostGroups.hostname )
140 141
                 ).filter(HostGroups.groupname.in_(get_user_groups())
141 142
                 ).filter(Events.idevent == idevent)[0]
142

  
143 143
        initial_state = DBSession.query(EventHistory
144 144
                 ).filter(EventHistory.idevent == idevent
145 145
                 ).order_by(asc(EventHistory.timestamp)
146 146
                 ).order_by(asc(EventHistory.type_action))
147

  
148 147
        if initial_state.count() > 0 :
149
            initial_state = initial_state[0].value
148
            for i in initial_state:
149
                if i.value != '' and i.value is not None:
150
                    initial_state = i.value
151
                    break
150 152
        else :
151 153
            initial_state = 0
152 154
        
......
204 206
               history = events.hist,
205 207
               hist_error = True,
206 208
               plugin_context = events.context_fct,
207
               search = 0
209
               search = {'host':None,'service':None,'output':None,'tt':None}
208 210
            )
209 211

  
210 212
    @validate(validators={'host':validators.NotEmpty(),
......
245 247
               history = events.hist,
246 248
               hist_error = True,
247 249
               plugin_context = events.context_fct,
248
               search = 0
250
               search = {'host':None,'service':None,'output':None,'tt':None}
249 251
            )
250 252

  
251 253
    @validate(validators={
......
330 332
            return p.controller(*arg,**krgv)
331 333
        except:
332 334
            raise
335
    
336
    @validate(validators={"fontsize":validators.Int()}, error_handler=process_form_errors)
337
    @expose('json')
338
    def set_fontsize(self,fontsize):
339
        try:
340
            session['fontsize'] = fontsize
341
            session.save()
342
            return dict(ret='ok')
343
        except:
344
            return dict(ret='fail')
345

  
346
    @validate(validators={"refresh":validators.Int()}, error_handler=process_form_errors)
347
    @expose('json')
348
    def set_refresh(self,refresh):
349
        try:
350
            session['refresh'] = refresh
351
            session.save()
352
            return dict(ret='ok')
353
        except:
354
            return dict(ret='fail')
355

  

Also available in: Unified diff