Revision 303419a6
L'implémentation pour access_needed n'est pas prête et fait planter les tests unitaires. Virée pour le moment.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@5673 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/root.py | ||
---|---|---|
551 | 551 |
ids = map(int, id.strip(',').split(',')) |
552 | 552 |
|
553 | 553 |
user = get_current_user() |
554 |
events = VigiboardRequest(user, access_needed=['w'])
|
|
554 |
events = VigiboardRequest(user) |
|
555 | 555 |
events.add_table(CorrEvent) |
556 | 556 |
events.add_join((Event, CorrEvent.idcause == Event.idevent)) |
557 | 557 |
events.add_join((events.items, |
... | ... | |
840 | 840 |
|
841 | 841 |
return dict(groups = groups, leaves=[]) |
842 | 842 |
|
843 |
# @require(access_restriction) |
|
844 |
# @expose('json') |
|
845 |
# def get_groups(self): |
|
846 |
# hierarchy = [] |
|
847 |
# user = get_current_user() |
|
848 |
# groups = DBSession.query( |
|
849 |
# SupItemGroup.idgroup, |
|
850 |
# SupItemGroup.name, |
|
851 |
# GroupHierarchy.idparent, |
|
852 |
# ).join( |
|
853 |
# (GroupHierarchy, GroupHierarchy.idchild == \ |
|
854 |
# SupItemGroup.idgroup), |
|
855 |
# ).filter(GroupHierarchy.hops <= 1 |
|
856 |
# ).order_by(GroupHierarchy.hops.asc() |
|
857 |
# ).order_by(SupItemGroup.name.asc()) |
|
858 |
|
|
859 |
# is_manager = in_group('managers').is_met(request.environ) |
|
860 |
# if not is_manager: |
|
861 |
# user_groups = [ug[0] for ug in user.supitemgroups() if ug[1]] |
|
862 |
# groups = groups.filter(SupItemGroup.idgroup.in_(user_groups)) |
|
863 |
|
|
864 |
# def find_parent(idgroup): |
|
865 |
# def __find_parent(hier, idgroup): |
|
866 |
# for g in hier: |
|
867 |
# if g['idgroup'] == idgroup: |
|
868 |
# return g['children'] |
|
869 |
# for g in hier: |
|
870 |
# res = __find_parent(g['children'], idgroup) |
|
871 |
# if res: |
|
872 |
# return res |
|
873 |
# return None |
|
874 |
# parent = __find_parent(hierarchy, idgroup) |
|
875 |
# if parent is None: |
|
876 |
# return hierarchy |
|
877 |
# return parent |
|
878 |
|
|
879 |
# for g in groups.all(): |
|
880 |
# parent = find_parent(g.idparent) |
|
881 |
# for item in hierarchy: |
|
882 |
# if item['idgroup'] == g.idgroup: |
|
883 |
# parent.append(item) |
|
884 |
# hierarchy.remove(item) |
|
885 |
# break |
|
886 |
# else: |
|
887 |
# parent.append({ |
|
888 |
# 'idgroup': g.idgroup, |
|
889 |
# 'name': g.name, |
|
890 |
# 'children': [], |
|
891 |
# }) |
|
892 |
|
|
893 |
# return dict(groups=hierarchy) |
|
894 |
|
|
895 | 843 |
def get_last_modification_timestamp(event_id_list, |
896 | 844 |
value_if_none=datetime.now()): |
897 | 845 |
""" |
Also available in: Unified diff