Revision 7e1403ac
Correction de typos dans les textes à traduire.
Ajout de distinct() aux endroits appropriés du contrôleur RPC de VigiGraph.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2656 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigigraph/controllers/rpc.py | ||
|---|---|---|
| 91 | 91 |
hostgroups = DBSession.query( |
| 92 | 92 |
SupItemGroup.name, |
| 93 | 93 |
SupItemGroup.idgroup, |
| 94 |
).join( |
|
| 94 |
).distinct().join(
|
|
| 95 | 95 |
(GroupHierarchy, GroupHierarchy.idchild == \ |
| 96 | 96 |
SupItemGroup.idgroup), |
| 97 | 97 |
).filter(GroupHierarchy.idparent == maingroupid |
| ... | ... | |
| 318 | 318 |
# l'utilisateur a accès et auquel l'hôte donné appartient. |
| 319 | 319 |
idsupitemgroup = DBSession.query( |
| 320 | 320 |
SupItemGroup.idgroup, |
| 321 |
).join( |
|
| 321 |
).distinct().join(
|
|
| 322 | 322 |
(SUPITEM_GROUP_TABLE, SUPITEM_GROUP_TABLE.c.idgroup == \ |
| 323 | 323 |
SupItemGroup.idgroup), |
| 324 | 324 |
(Host, Host.idhost == SUPITEM_GROUP_TABLE.c.idsupitem), |
| ... | ... | |
| 331 | 331 |
if idsupitemgroup is not None: |
| 332 | 332 |
selected_hostgroups = DBSession.query( |
| 333 | 333 |
SupItemGroup.name, |
| 334 |
).join( |
|
| 334 |
).distinct().join(
|
|
| 335 | 335 |
(GroupHierarchy, GroupHierarchy.idparent == \ |
| 336 | 336 |
GraphGroup.idgroup), |
| 337 | 337 |
).filter(GroupHierarchy.idchild == idsupitemgroup |
| ... | ... | |
| 344 | 344 |
# cette fois les GraphGroup à la place des SupItemGroup. |
| 345 | 345 |
idgraphgroup = DBSession.query( |
| 346 | 346 |
GraphGroup.idgroup, |
| 347 |
).join( |
|
| 347 |
).distinct().join(
|
|
| 348 | 348 |
(GRAPH_GROUP_TABLE, GRAPH_GROUP_TABLE.c.idgroup == \ |
| 349 | 349 |
GraphGroup.idgroup), |
| 350 | 350 |
(Graph, Graph.idgraph == GRAPH_GROUP_TABLE.c.idgraph), |
| ... | ... | |
| 355 | 355 |
if idgraphgroup is not None: |
| 356 | 356 |
selected_graphgroups = DBSession.query( |
| 357 | 357 |
GraphGroup.name, |
| 358 |
).join( |
|
| 358 |
).distinct().join(
|
|
| 359 | 359 |
(GroupHierarchy, GroupHierarchy.idparent == \ |
| 360 | 360 |
GraphGroup.idgroup), |
| 361 | 361 |
).filter(GroupHierarchy.idchild == idgraphgroup |
| ... | ... | |
| 410 | 410 |
result = rrdproxy.get_img_name_with_params(host, graph, \ |
| 411 | 411 |
direct, duration, start, int(details)) |
| 412 | 412 |
except urllib2.URLError: |
| 413 |
txt = _("Can't get RRD graph \"%(graph)\" on "
|
|
| 413 |
txt = _("Can't get RRD graph \"%(graph)s\" on "
|
|
| 414 | 414 |
"host \"%(host)s\"") % {
|
| 415 | 415 |
'graph': graph, |
| 416 | 416 |
'host': host, |
| ... | ... | |
| 463 | 463 |
result = rrdproxy.get_img_with_params(host, graph, direct, \ |
| 464 | 464 |
duration, start, int(details)) |
| 465 | 465 |
except urllib2.URLError: |
| 466 |
txt = _("Can't get RRD graph \"%(graph)\" on "
|
|
| 466 |
txt = _("Can't get RRD graph \"%(graph)s\" on "
|
|
| 467 | 467 |
"host \"%(host)s\"") % {
|
| 468 | 468 |
'graph': graph, |
| 469 | 469 |
'host': host, |
| ... | ... | |
| 797 | 797 |
start = int(time.time()) - int(duration) |
| 798 | 798 |
|
| 799 | 799 |
# graphes pour hote |
| 800 |
hgs = DBSession.query(Graph.name) \ |
|
| 800 |
hgs = DBSession.query(Graph.name).distinct() \
|
|
| 801 | 801 |
.join((GRAPH_PERFDATASOURCE_TABLE, \ |
| 802 | 802 |
GRAPH_PERFDATASOURCE_TABLE.c.idgraph == Graph.idgraph)) \ |
| 803 | 803 |
.join((PerfDataSource, \ |
Also available in: Unified diff