Project

General

Profile

Revision 032d0f30

ID032d0f3077112617ae8f26a60a9c6032f1ebee2b
Parent 8a4a20e4
Child e88149e8

Added by Vincent QUEMENER about 13 years ago

Correction de coquilles et d'oublis.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@6684 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/controllers/plugins/groups.py
32 32 
from vigilo.models.tables.group import Group
33 33 
from vigilo.models.tables.grouphierarchy import GroupHierarchy
34 34 
from vigilo.models.tables.secondary_tables import SUPITEM_GROUP_TABLE
35 
from sqlalchemy.sql.expression import or_
35 36 

  		




  36
  37
  
    
from repoze.what.predicates import in_group


  		




  37
  38
  
    
from tg import request


  		












  

    
      vigiboard/controllers/vigiboardrequest.py
    
  





  82
  82
  
    
                Host.idhost.label("idsupitem"),


  		




  83
  83
  
    
                expr_null().label("servicename"),


  		




  84
  84
  
    
                Host.name.label("hostname"),


  		




  85
  
  
    
            ).host_query.distinct()


  		




  
  85
  
    
            ).distinct()


  		




  86
  86
  
    

  		




  87
  87
  
    
            # Application des filtres des plugins si nécessaire.


  		




  88
  88
  
    
            if search is not None:


  		




  ......




  90
  90
  
    
                # par référence dans les fonctions.


  		




  91
  91
  
    
                subqueries = [lls_query, host_query]


  		




  92
  92
  
    
                for plugin, instance in config.get('columns_plugins', []):


  		




  93
  
  
    
                    instance.handle_search_fields(self, search, )


  		




  
  93
  
    
                    instance.handle_search_fields(self, search, subqueries)


  		




  94
  94
  
    
                lls_query = subqueries[0]


  		




  95
  95
  
    
                host_query = subqueries[1]


  		




  96
  96
  
    

  		












Also available in:  Unified diff