Revision 916e4b79
pylint
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@6674 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/vigiboardrequest.py | ||
---|---|---|
33 | 33 |
|
34 | 34 |
from vigilo.models.session import DBSession |
35 | 35 |
from vigilo.models.tables import Event, CorrEvent, EventHistory, \ |
36 |
Host, LowLevelService, StateName, DataPermission, UserSupItem
|
|
36 |
Host, LowLevelService, StateName, UserSupItem |
|
37 | 37 |
from vigilo.models.tables.grouphierarchy import GroupHierarchy |
38 |
from vigilo.models.tables.secondary_tables import SUPITEM_GROUP_TABLE, \ |
|
39 |
USER_GROUP_TABLE |
|
38 |
from vigilo.models.tables.secondary_tables import SUPITEM_GROUP_TABLE |
|
40 | 39 |
from vigiboard.widgets.edit_event import EditEventForm |
41 | 40 |
from vigiboard.controllers.plugins import VigiboardRequestPlugin |
42 | 41 |
|
... | ... | |
76 | 75 |
).join( |
77 | 76 |
(Host, Host.idhost == LowLevelService.idhost), |
78 | 77 |
) |
79 |
|
|
78 |
|
|
80 | 79 |
# Ajout d'un filtre sur le groupe de supitems |
81 | 80 |
if supitemgroup: |
82 | 81 |
self.lls_query = self.lls_query.join( |
... | ... | |
88 | 87 |
LowLevelService.idservice, |
89 | 88 |
) |
90 | 89 |
), |
91 |
(GroupHierarchy, GroupHierarchy.idchild ==
|
|
90 |
(GroupHierarchy, GroupHierarchy.idchild == |
|
92 | 91 |
SUPITEM_GROUP_TABLE.c.idgroup) |
93 | 92 |
).filter( |
94 | 93 |
GroupHierarchy.idparent == supitemgroup |
... | ... | |
102 | 101 |
expr_null().label("servicename"), |
103 | 102 |
Host.name.label("hostname"), |
104 | 103 |
) |
105 |
|
|
104 |
|
|
106 | 105 |
# Ajout d'un filtre sur le groupe de supitems |
107 | 106 |
if supitemgroup: |
108 | 107 |
self.host_query = self.host_query.join( |
... | ... | |
110 | 109 |
SUPITEM_GROUP_TABLE.c.idsupitem == \ |
111 | 110 |
Host.idhost, |
112 | 111 |
), |
113 |
(GroupHierarchy, GroupHierarchy.idchild ==
|
|
112 |
(GroupHierarchy, GroupHierarchy.idchild == |
|
114 | 113 |
SUPITEM_GROUP_TABLE.c.idgroup) |
115 | 114 |
).filter( |
116 | 115 |
GroupHierarchy.idparent == supitemgroup |
... | ... | |
127 | 126 |
|
128 | 127 |
# Sinon, on ne récupère que les hôtes/services auquel il a accès. |
129 | 128 |
else: |
130 |
self.items = DBSession.query(
|
|
129 |
items = DBSession.query( |
|
131 | 130 |
UserSupItem.idsupitem, |
132 | 131 |
UserSupItem.servicename, |
133 | 132 |
UserSupItem.hostname, |
... | ... | |
137 | 136 |
|
138 | 137 |
# Ajout d'un filtre sur le groupe de supitems |
139 | 138 |
if supitemgroup: |
140 |
self.items = self.items.filter(
|
|
139 |
items = items.filter(
|
|
141 | 140 |
UserSupItem.idsupitemgroup == supitemgroup |
142 | 141 |
) |
143 |
|
|
144 |
self.items = self.items.distinct().subquery()
|
|
142 |
|
|
143 |
self.items = items.distinct().subquery() |
|
145 | 144 |
|
146 | 145 |
# Éléments à retourner (SELECT ...) |
147 | 146 |
self.table = [] |
vigiboard/widgets/edit_event.py | ||
---|---|---|
20 | 20 |
|
21 | 21 |
"""Le formulaire d'édition d'un événement.""" |
22 | 22 |
|
23 |
import tg |
|
24 | 23 |
from pylons.i18n import lazy_ugettext as l_ |
25 | 24 |
from tw.api import WidgetsList |
26 | 25 |
from tw.forms import TableForm, SingleSelectField, TextField, \ |
... | ... | |
52 | 51 |
""" |
53 | 52 |
|
54 | 53 |
class fields(WidgetsList): |
54 |
""" |
|
55 |
Champs du formulaire d'édition des événements. |
|
56 |
""" |
|
55 | 57 |
id = HiddenField('id') |
56 | 58 |
trouble_ticket = TextField(label_text=l_('Trouble Ticket')) |
57 | 59 |
warning = Label(suppress_label=True, text=l_('Warning: changing ' |
Also available in: Unified diff