Revision 7bde24ad
[#1457] Rafraichissement AJAX dans VigiBoard
Change le mécanisme de rafraichissement du tableau de VigiBoard pour
utiliser de l'AJAX.
Réutilise le fichier "loader.js" pour obtenir un sablier lors du
chargement (et donc suppression des copies dans VigiMap/VigiGraph).
Le script "loader.js" est enrichi pour pouvoir ajouter la notion d'un
calque qui est rendu semi-opaque lors de l'exécution de la requête.
Change-Id: Idc537cd8b4f257af9fcd6ac8c6334deadd9d042a
Refs: #1457.
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/1898
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Francois POIROTTE <francois.poirotte@c-s.fr>
| vigiboard/tests/functional/test_sorting.py | ||
|---|---|---|
| 67 | 67 |
# - la 2nde concerne 'service1' sur 'host2'. |
| 68 | 68 |
# Il doit y avoir plusieurs colonnes dans la ligne de résultats. |
| 69 | 69 |
hostnames = response.lxml.xpath( |
| 70 |
'//table[@class="vigitable"]/tbody/tr/' \
|
|
| 71 |
'td[@class="plugin_hostname"]/text()') |
|
| 70 |
'//table[contains(concat(" ", @class, " "), " vigitable ")]'
|
|
| 71 |
'/tbody/tr/td[@class="plugin_hostname"]/text()')
|
|
| 72 | 72 |
assert_equal(hostnames, ['host1', 'host2']) |
| 73 | 73 |
servicenames = response.lxml.xpath( |
| 74 |
'//table[@class="vigitable"]/tbody/tr/' \
|
|
| 75 |
'td[@class="plugin_servicename"]/text()') |
|
| 74 |
'//table[contains(concat(" ", @class, " "), " vigitable ")]'
|
|
| 75 |
'/tbody/tr/td[@class="plugin_servicename"]/text()')
|
|
| 76 | 76 |
assert_equal(servicenames, ['service2', 'service1']) |
| 77 | 77 |
|
| 78 | 78 |
def test_descending_order(self): |
| ... | ... | |
| 89 | 89 |
# - la 2nde concerne 'service1' sur 'host2'. |
| 90 | 90 |
# Il doit y avoir plusieurs colonnes dans la ligne de résultats. |
| 91 | 91 |
hostnames = response.lxml.xpath( |
| 92 |
'//table[@class="vigitable"]/tbody/tr/' \
|
|
| 93 |
'td[@class="plugin_hostname"]/text()') |
|
| 92 |
'//table[contains(concat(" ", @class, " "), " vigitable ")]'
|
|
| 93 |
'/tbody/tr/td[@class="plugin_hostname"]/text()')
|
|
| 94 | 94 |
assert_equal(hostnames, ['host1', 'host2']) |
| 95 | 95 |
servicenames = response.lxml.xpath( |
| 96 |
'//table[@class="vigitable"]/tbody/tr/' \
|
|
| 97 |
'td[@class="plugin_servicename"]/text()') |
|
| 96 |
'//table[contains(concat(" ", @class, " "), " vigitable ")]'
|
|
| 97 |
'/tbody/tr/td[@class="plugin_servicename"]/text()')
|
|
| 98 | 98 |
assert_equal(servicenames, ['service2', 'service1']) |
| 99 | 99 |
|
| 100 | 100 |
def test_pagination(self): |
| ... | ... | |
| 122 | 122 |
# Il ne doit y avoir qu'une seule ligne de |
| 123 | 123 |
# résultats concernant "service2" sur "host1" |
| 124 | 124 |
hostnames = response.lxml.xpath( |
| 125 |
'//table[@class="vigitable"]/tbody/tr/' \
|
|
| 126 |
'td[@class="plugin_hostname"]/text()') |
|
| 125 |
'//table[contains(concat(" ", @class, " "), " vigitable ")]'
|
|
| 126 |
'/tbody/tr/td[@class="plugin_hostname"]/text()')
|
|
| 127 | 127 |
assert_equal(hostnames, ['host1']) |
| 128 | 128 |
servicenames = response.lxml.xpath( |
| 129 |
'//table[@class="vigitable"]/tbody/tr/' \
|
|
| 130 |
'td[@class="plugin_servicename"]/text()') |
|
| 129 |
'//table[contains(concat(" ", @class, " "), " vigitable ")]'
|
|
| 130 |
'/tbody/tr/td[@class="plugin_servicename"]/text()')
|
|
| 131 | 131 |
assert_equal(servicenames, ['service2']) |
| 132 | 132 |
|
| 133 | 133 |
|
Also available in: Unified diff