From a96aaa82e09b75f9da2861958ad17c9a59fad3b3 Mon Sep 17 00:00:00 2001 From: Luca Date: Mon, 20 Aug 2018 10:57:36 +0200 Subject: [PATCH] =?UTF-8?q?Bugfix:=20Una=20volta=20associato=20un=20interv?= =?UTF-8?q?ento=20al=20contratto=20non=20era=20pi=C3=B9=20possibile=20camb?= =?UTF-8?q?iare=20il=20contratto.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/interventi/edit.php | 8 ++++---- modules/interventi/init.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php index 72e46eccf..75452c7dd 100644 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -59,22 +59,22 @@ $_SESSION['superselect']['idanagrafica'] = $records[0]['idanagrafica'];
fetchArray('SELECT id, idcontratto FROM co_contratti_promemoria WHERE idintervento='.prepare($id_record)); + /*$rs = $dbo->fetchArray('SELECT id, idcontratto FROM co_contratti_promemoria WHERE idintervento='.prepare($id_record)); if (count($rs) == 1) { $idcontratto = $rs[0]['idcontratto']; $idcontratto_riga = $rs[0]['id']; } else { $idcontratto = ''; $idcontratto_riga = ''; - } - + }*/ + if (($idcontratto != '')) { echo ' '.Modules::link('Contratti', $idcontratto, null, null, 'class="pull-right"'); } ?> - {[ "type": "select", "label": "", "name": "idcontratto", "value": "", "ajax-source": "contratti", "readonly": "" ]} + {[ "type": "select", "label": "", "name": "idcontratto", "value": "", "ajax-source": "contratti", "readonly": "" ]}
diff --git a/modules/interventi/init.php b/modules/interventi/init.php index 1b6cc1a61..916627115 100644 --- a/modules/interventi/init.php +++ b/modules/interventi/init.php @@ -3,7 +3,7 @@ include_once __DIR__.'/../../core.php'; if (isset($id_record)) { - $records = $dbo->fetchArray('SELECT *, (SELECT completato FROM in_statiintervento WHERE idstatointervento=in_interventi.idstatointervento) AS flag_completato, IF((in_interventi.idsede = 0), (SELECT idzona FROM an_anagrafiche WHERE idanagrafica = in_interventi.idanagrafica), (SELECT idzona FROM an_sedi WHERE id = in_interventi.idsede)) AS idzona, (SELECT colore FROM in_statiintervento WHERE idstatointervento=in_interventi.idstatointervento) AS colore, (SELECT idpreventivo FROM co_preventivi_interventi WHERE idintervento=in_interventi.id LIMIT 0,1) AS idpreventivo FROM in_interventi WHERE id='.prepare($id_record).Modules::getAdditionalsQuery($id_module)); + $records = $dbo->fetchArray('SELECT *, (SELECT completato FROM in_statiintervento WHERE idstatointervento=in_interventi.idstatointervento) AS flag_completato, IF((in_interventi.idsede = 0), (SELECT idzona FROM an_anagrafiche WHERE idanagrafica = in_interventi.idanagrafica), (SELECT idzona FROM an_sedi WHERE id = in_interventi.idsede)) AS idzona, (SELECT colore FROM in_statiintervento WHERE idstatointervento=in_interventi.idstatointervento) AS colore, (SELECT idcontratto FROM co_contratti_promemoria WHERE idintervento=in_interventi.id LIMIT 0,1) AS idcontratto, (SELECT idpreventivo FROM co_preventivi_interventi WHERE idintervento=in_interventi.id LIMIT 0,1) AS idpreventivo FROM in_interventi WHERE id='.prepare($id_record).Modules::getAdditionalsQuery($id_module)); } $jscript_modules[] = $rootdir.'/modules/interventi/js/interventi_helperjs.js';