Revision ddde113a
Suppression des '*' implicites autour des valeurs saisies lors d'une recherche,
l'opérateur peut les indiquer explicitement s'il le souhaite.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@3496 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/controllers/root.py | ||
|---|---|---|
| 132 | 132 |
aggregates.add_join((SupItemGroup, SupItemGroup.idgroup == \ |
| 133 | 133 |
aggregates.items.c.idsupitemgroup)) |
| 134 | 134 |
aggregates.add_filter( |
| 135 |
SupItemGroup.name.ilike('%%%s%%' % supitemgroup))
|
|
| 135 |
SupItemGroup.name.ilike('%s' % supitemgroup))
|
|
| 136 | 136 |
|
| 137 | 137 |
if host: |
| 138 | 138 |
search['host'] = host |
| 139 | 139 |
host = sql_escape_like(host) |
| 140 | 140 |
aggregates.add_filter(aggregates.items.c.hostname.ilike( |
| 141 |
'%%%s%%' % host))
|
|
| 141 |
'%s' % host))
|
|
| 142 | 142 |
|
| 143 | 143 |
if service: |
| 144 | 144 |
search['service'] = service |
| 145 | 145 |
service = sql_escape_like(service) |
| 146 | 146 |
aggregates.add_filter(aggregates.items.c.servicename.ilike( |
| 147 |
'%%%s%%' % service))
|
|
| 147 |
'%s' % service))
|
|
| 148 | 148 |
|
| 149 | 149 |
if output: |
| 150 | 150 |
search['output'] = output |
| 151 | 151 |
output = sql_escape_like(output) |
| 152 |
aggregates.add_filter(Event.message.ilike('%%%s%%' % output))
|
|
| 152 |
aggregates.add_filter(Event.message.ilike('%s' % output))
|
|
| 153 | 153 |
|
| 154 | 154 |
if trouble_ticket: |
| 155 | 155 |
search['tt'] = trouble_ticket |
| 156 | 156 |
trouble_ticket = sql_escape_like(trouble_ticket) |
| 157 | 157 |
aggregates.add_filter(CorrEvent.trouble_ticket.ilike( |
| 158 |
'%%%s%%' % trouble_ticket))
|
|
| 158 |
'%s' % trouble_ticket))
|
|
| 159 | 159 |
|
| 160 | 160 |
if from_date: |
| 161 | 161 |
search['from_date'] = from_date.lower() |
Also available in: Unified diff