From 9e34ed1170519571b15348cdb6339eaca8394600 Mon Sep 17 00:00:00 2001 From: Luca Date: Sat, 26 May 2018 02:29:12 +0200 Subject: [PATCH] Fix select impianti add intervento MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Se si aggiunge un articolo ad un intervento, rimanendo settato il session del filtro superselect idintervento, non venivano più mostrati gli impianti del cliente. --- modules/my_impianti/ajax/select.php | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/my_impianti/ajax/select.php b/modules/my_impianti/ajax/select.php index 4209606bd..96a1dbd9b 100644 --- a/modules/my_impianti/ajax/select.php +++ b/modules/my_impianti/ajax/select.php @@ -4,21 +4,7 @@ include_once __DIR__.'/../../../core.php'; switch ($resource) { case 'impianti': - if( isset($superselect['idintervento']) ){ - $query = 'SELECT id, CONCAT(matricola, " - ", nome) AS descrizione FROM my_impianti INNER JOIN my_impianti_interventi ON my_impianti.id=my_impianti_interventi.idimpianto |where| ORDER BY idsede'; - - foreach ($elements as $element) { - $filter[] = 'id='.prepare($element); - } - - $where[] = 'my_impianti_interventi.idintervento='.prepare($superselect['idintervento']); - - if (!empty($search)) { - $search_fields[] = 'nome LIKE '.prepare('%'.$search.'%'); - $search_fields[] = 'matricola LIKE '.prepare('%'.$search.'%'); - } - } - elseif (isset($superselect['idanagrafica'])) { + if (isset($superselect['idanagrafica'])) { $query = 'SELECT id, CONCAT(matricola, " - ", nome) AS descrizione FROM my_impianti |where| ORDER BY idsede'; foreach ($elements as $element) { @@ -33,5 +19,19 @@ switch ($resource) { $search_fields[] = 'matricola LIKE '.prepare('%'.$search.'%'); } } + elseif( isset($superselect['idintervento']) ){ + $query = 'SELECT id, CONCAT(matricola, " - ", nome) AS descrizione FROM my_impianti INNER JOIN my_impianti_interventi ON my_impianti.id=my_impianti_interventi.idimpianto |where| ORDER BY idsede'; + + foreach ($elements as $element) { + $filter[] = 'id='.prepare($element); + } + + $where[] = 'my_impianti_interventi.idintervento='.prepare($superselect['idintervento']); + + if (!empty($search)) { + $search_fields[] = 'nome LIKE '.prepare('%'.$search.'%'); + $search_fields[] = 'matricola LIKE '.prepare('%'.$search.'%'); + } + } break; }