Revision 35cea70e
Correction Bug + Contrôle Pylint
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@291 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/vigiboard_ctl/vigiboardrequest.py | ||
---|---|---|
2 | 2 |
# vim:set expandtab tabstop=4 shiftwidth=4: |
3 | 3 |
"""Gestion de la requête, des plugins et de l'affichage du Vigiboard""" |
4 | 4 |
|
5 |
from vigiboard.model.vigiboard_bdd import * |
|
5 |
from vigiboard.model.vigiboard_bdd import Events, Host, Service, \ |
|
6 |
HostGroups, ServiceGroups, EventHistory |
|
6 | 7 |
from tg import tmpl_context, url |
7 | 8 |
from vigiboard.model import DBSession |
8 | 9 |
from sqlalchemy import not_ , and_ , asc , desc |
9 | 10 |
from tw.jquery import JQueryUIDialog |
10 |
from vigiboard.widgets.edit_event import Edit_Event_Form , Search_Form
|
|
11 |
from vigiboard.widgets.edit_event import EditEventForm , SearchForm
|
|
11 | 12 |
from vigiboard.controllers.vigiboard_ctl.userutils import get_user_groups |
12 | 13 |
from pylons.i18n import ugettext as _ |
13 | 14 |
|
... | ... | |
71 | 72 |
""" |
72 | 73 |
for i in argv : |
73 | 74 |
if isinstance(i, VigiboardRequestPlugin): |
74 |
self.add_table(*i.table) |
|
75 |
self.add_join(*i.join) |
|
76 |
self.add_outer_join(*i.outerjoin) |
|
77 |
self.add_filter(*i.filter) |
|
78 |
self.add_group_by(*i.groupby) |
|
79 |
self.add_order_by(*i.orderby) |
|
75 |
if i.table : |
|
76 |
self.add_table(*i.table) |
|
77 |
if i.join : |
|
78 |
self.add_join(*i.join) |
|
79 |
if i.outerjoin : |
|
80 |
self.add_outer_join(*i.outerjoin) |
|
81 |
if i.filter : |
|
82 |
self.add_filter(*i.filter) |
|
83 |
if i.groupby : |
|
84 |
self.add_group_by(*i.groupby) |
|
85 |
if i.orderby : |
|
86 |
self.add_order_by(*i.orderby) |
|
80 | 87 |
self.plugin.append(i) |
81 | 88 |
|
82 | 89 |
def generate_request(self): |
... | ... | |
396 | 403 |
""" |
397 | 404 |
|
398 | 405 |
# Dialogue d'édition |
399 |
tmpl_context.edit_event_form = Edit_Event_Form('edit_event_form',
|
|
406 |
tmpl_context.edit_event_form = EditEventForm('edit_event_form',
|
|
400 | 407 |
action=url('/vigiboard/update')) |
401 | 408 |
tmpl_context.edit_eventdialog = JQueryUIDialog(id='Edit_EventsDialog', |
402 | 409 |
autoOpen=False,title=_('Edit Event')) |
403 | 410 |
|
404 | 411 |
# Dialogue de recherche |
405 |
tmpl_context.search_form = Search_Form('search_form',
|
|
412 |
tmpl_context.search_form = SearchForm('search_form', |
|
406 | 413 |
action=url('/vigiboard')) |
407 | 414 |
tmpl_context.searchdialog = JQueryUIDialog(id='SearchDialog', |
408 | 415 |
autoOpen=False,title=_('Search Event')) |
... | ... | |
417 | 424 |
Classe dont les plugins utilisé dans VigiboardRequest doivent étendre. |
418 | 425 |
""" |
419 | 426 |
|
420 |
def __init__ (self, table = [], join = [], outerjoin = [], filter = [], |
|
421 |
groupby = [], orderby = [], name = '', style = {}): |
|
427 |
def __init__ (self, table = None, join = None, outerjoin = None, |
|
428 |
filters = None, groupby = None, orderby = None, name = '', |
|
429 |
style = None): |
|
430 |
|
|
422 | 431 |
self.table = table |
423 | 432 |
self.join = join |
424 | 433 |
self.outerjoin = outerjoin |
425 |
self.filter = filter |
|
434 |
self.filter = filters
|
|
426 | 435 |
self.orderby = orderby |
427 | 436 |
self.name = name |
428 | 437 |
self.groupby = groupby |
Also available in: Unified diff