Revision 02c4a1e7
[#1543] Compatibilité TG 2.3.x
Change-Id: I9171224d261ccbc2d9a1b3d3c9107f10742bdd54
Refs: #1543
| vigiboard/controllers/plugins/details.py | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import urllib |
| 13 | 13 |
from tg import config, url, request |
| 14 |
from pylons.i18n import lazy_ugettext as l_
|
|
| 14 |
from tg.i18n import lazy_ugettext as l_
|
|
| 15 | 15 |
import tw.forms as twf |
| 16 | 16 |
from sqlalchemy.sql.expression import null as expr_null, union_all |
| 17 | 17 |
from sqlalchemy import func |
| 18 | 18 |
|
| 19 |
from repoze.what.predicates import has_permission, in_group
|
|
| 19 |
from tg.predicates import has_permission, in_group
|
|
| 20 | 20 |
from vigilo.turbogears.helpers import get_current_user |
| 21 | 21 |
|
| 22 | 22 |
from vigilo.models.session import DBSession |
| ... | ... | |
| 83 | 83 |
items = DBSession.query( |
| 84 | 84 |
Map.idmap, |
| 85 | 85 |
Map.title, |
| 86 |
func.lower(Map.title), |
|
| 87 | 86 |
).distinct( |
| 88 | 87 |
).join( |
| 89 | 88 |
(MAP_GROUP_TABLE, MAP_GROUP_TABLE.c.idmap == Map.idmap), |
| 90 |
(MapGroup, MapGroup.idgroup == MAP_GROUP_TABLE.c.idgroup), |
|
| 91 | 89 |
(MapNodeHost, MapNodeHost.idmap == Map.idmap), |
| 92 | 90 |
).order_by(func.lower(Map.title).asc() |
| 93 | 91 |
).filter(MapNodeHost.idhost == event.idhost) |
| ... | ... | |
| 95 | 93 |
if not is_manager: |
| 96 | 94 |
mapgroups = get_current_user().mapgroups(only_direct=True) |
| 97 | 95 |
# pylint: disable-msg=E1103 |
| 98 |
items = items.filter(MapGroup.idgroup.in_(mapgroups))
|
|
| 96 |
items = items.filter(MAP_GROUP_TABLE.c.idgroup.in_(mapgroups))
|
|
| 99 | 97 |
|
| 100 | 98 |
# La valeur -1 supprime la limite. |
| 101 | 99 |
if max_maps > 0: |
| ... | ... | |
| 202 | 200 |
return |
| 203 | 201 |
|
| 204 | 202 |
states = [] |
| 205 |
for value in search.get('state'):
|
|
| 203 |
for value in search.get('state', []):
|
|
| 206 | 204 |
try: |
| 207 | 205 |
states.append(int(value)) |
| 208 | 206 |
except (ValueError, TypeError): |
| 209 | 207 |
try: |
| 210 | 208 |
states.append(StateName.statename_to_value(value)) |
| 211 | 209 |
except: |
| 212 |
# On ignore silencieusement un critère de recherche erroné.
|
|
| 210 |
# On ignore silencieusement un critère de recherche erroné |
|
| 213 | 211 |
pass |
| 214 | 212 |
|
| 215 | 213 |
if states: |
Also available in: Unified diff