Revision 3c4e7981
Prise en compte changement API SQLAlchemy 0.6.x.
La méthode scalar() lève désormais une erreur si plusieurs entrées sont
retournées.
Change-Id: I596e59e88ca0754545042ffebc9c5b04246d57d2
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/1268
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Francois POIROTTE <francois.poirotte@c-s.fr>
| vigigraph/controllers/rpc.py | ||
|---|---|---|
| 29 | 29 |
from formencode import schema |
| 30 | 30 |
from tw.forms import validators |
| 31 | 31 |
from sqlalchemy.orm import aliased, lazyload |
| 32 |
from sqlalchemy.sql import functions |
|
| 32 | 33 |
|
| 33 | 34 |
from vigilo.turbogears.controllers import BaseController |
| 34 | 35 |
from vigilo.turbogears.helpers import get_current_user |
| ... | ... | |
| 541 | 542 |
|
| 542 | 543 |
# Distance positive. |
| 543 | 544 |
distance = DBSession.query( |
| 544 |
GroupHierarchy.hops
|
|
| 545 |
functions.max(GroupHierarchy.hops)
|
|
| 545 | 546 |
).join( |
| 546 | 547 |
(Group, Group.idgroup == GroupHierarchy.idparent), |
| 547 | 548 |
(DataPermission, |
| ... | ... | |
| 553 | 554 |
).filter(USER_GROUP_TABLE.c.username == user.user_name |
| 554 | 555 |
).filter(Group.grouptype == u'supitemgroup' |
| 555 | 556 |
).filter(GroupHierarchy.idchild == parent_id |
| 556 |
).order_by(GroupHierarchy.hops.desc()).scalar()
|
|
| 557 |
).scalar() |
|
| 557 | 558 |
|
| 558 | 559 |
if distance is None: |
| 559 | 560 |
# Distance négative. |
| 560 | 561 |
distance = DBSession.query( |
| 561 |
GroupHierarchy.hops
|
|
| 562 |
functions.max(GroupHierarchy.hops)
|
|
| 562 | 563 |
).join( |
| 563 | 564 |
(Group, Group.idgroup == GroupHierarchy.idchild), |
| 564 | 565 |
(DataPermission, |
| ... | ... | |
| 570 | 571 |
).filter(USER_GROUP_TABLE.c.username == user.user_name |
| 571 | 572 |
).filter(Group.grouptype == u'supitemgroup' |
| 572 | 573 |
).filter(GroupHierarchy.idparent == parent_id |
| 573 |
).order_by(GroupHierarchy.hops.desc()).scalar()
|
|
| 574 |
).scalar() |
|
| 574 | 575 |
if distance is not None: |
| 575 | 576 |
distance = -distance |
| 576 | 577 |
|
Also available in: Unified diff