Revision a5f99051
Mini-corrections dans VigiBoard.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@3113 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/root.py | ||
---|---|---|
43 | 43 |
autocomplete = AutoCompleteController() |
44 | 44 |
|
45 | 45 |
# Prédicat pour la restriction de l'accès aux interfaces. |
46 |
# L'utilisateur doit avoir la permission "vigiboard-read"
|
|
46 |
# L'utilisateur doit avoir la permission "vigiboard-access"
|
|
47 | 47 |
# ou appartenir au groupe "managers" pour accéder à VigiBoard. |
48 | 48 |
access_restriction = All( |
49 | 49 |
not_anonymous(msg=l_("You need to be authenticated")), |
50 | 50 |
Any(in_group('managers'), |
51 |
has_permission('vigiboard-read'),
|
|
52 |
msg=l_("You don't have read access to VigiBoard"))
|
|
51 |
has_permission('vigiboard-access'),
|
|
52 |
msg=l_("You don't have access to VigiBoard")) |
|
53 | 53 |
) |
54 | 54 |
|
55 | 55 |
def process_form_errors(self, *argv, **kwargv): |
... | ... | |
520 | 520 |
All( |
521 | 521 |
not_anonymous(msg=l_("You need to be authenticated")), |
522 | 522 |
Any(in_group('managers'), |
523 |
has_permission('vigiboard-write'),
|
|
523 |
has_permission('vigiboard-update'),
|
|
524 | 524 |
msg=l_("You don't have write access to VigiBoard")) |
525 | 525 |
)) |
526 | 526 |
@expose() |
vigiboard/controllers/vigiboardrequest.py | ||
---|---|---|
58 | 58 |
lang = lang.replace('_', '-') |
59 | 59 |
lang = lang.split('-')[0] |
60 | 60 |
|
61 |
self.user_groups = user.supitemgroups(False)
|
|
61 |
self.user_groups = [ug[0] for ug in user.supitemgroups() if ug[1]]
|
|
62 | 62 |
self.lang = lang |
63 | 63 |
self.generaterq = False |
64 | 64 |
|
... | ... | |
423 | 423 |
tmpl_context.calendar_date_format = _('%Y-%m-%d %I:%M:%S %p') |
424 | 424 |
|
425 | 425 |
tmpl_context.edit_event_form = EditEventForm("edit_event_form", |
426 |
submit_text=l_('Apply'), action=url('/update'))
|
|
426 |
submit_text=_('Apply'), action=url('/update')) |
|
427 | 427 |
tmpl_context.search_form = SearchForm("search_form", |
428 |
submit_text=l_('Search'), action=url('/'))
|
|
428 |
submit_text=_('Search'), action=url('/')) |
|
429 | 429 |
|
Also available in: Unified diff