Revision 4654df60
Correction de la jointure effectuée lors du filtre sur les supitemgroups.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@6716 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/plugins/groups.py | ||
|---|---|---|
| 33 | 33 |
from vigilo.models.tables.grouphierarchy import GroupHierarchy |
| 34 | 34 |
from vigilo.models.tables.secondary_tables import SUPITEM_GROUP_TABLE |
| 35 | 35 |
from sqlalchemy.sql.expression import or_ |
| 36 |
from sqlalchemy.orm import aliased |
|
| 36 | 37 |
|
| 37 | 38 |
from repoze.what.predicates import in_group |
| 38 | 39 |
from tg import request |
| ... | ... | |
| 117 | 118 |
|
| 118 | 119 |
# Il s'agit d'un utilisateur normal. |
| 119 | 120 |
else: |
| 120 |
subqueries[0] = subqueries[0].filter( |
|
| 121 |
tables.UserSupItem.idsupitemgroup == search['supitemgroup'] |
|
| 121 |
GroupHierarchy_aliased = aliased(GroupHierarchy, |
|
| 122 |
name='GroupHierarchy_aliased') |
|
| 123 |
subqueries[0] = subqueries[0].join( |
|
| 124 |
(GroupHierarchy_aliased, GroupHierarchy_aliased.idchild == |
|
| 125 |
tables.UserSupItem.idsupitemgroup) |
|
| 126 |
).filter( |
|
| 127 |
GroupHierarchy_aliased.idparent == search['supitemgroup'] |
|
| 122 | 128 |
) |
| 129 |
|
|
Also available in: Unified diff