diff --git a/ajax_dataload.php b/ajax_dataload.php index f9c95ce8d..5d7d19efb 100644 --- a/ajax_dataload.php +++ b/ajax_dataload.php @@ -170,15 +170,11 @@ if (!empty($result_query) && $result_query != 'menu' && $result_query != 'custom // Icona di stampa elseif ($field == '_print_') { - $print_url = $r['_print_']; + $print = $r['_print_']; - preg_match_all('/\$(.+?)\$/', $print_url, $matches); + $print_url = Prints::getHref($print, $r['id']); - for ($m = 0; $m < sizeof($matches[0]); ++$m) { - $print_url = str_replace($matches[0][$m], $r[$matches[1][$m]], $print_url); - } - - $value = ''; + $value = ''; } // Icona diff --git a/update/2_4_1.sql b/update/2_4_1.sql index 2429c2ce9..bd51dd32e 100644 --- a/update/2_4_1.sql +++ b/update/2_4_1.sql @@ -477,6 +477,8 @@ INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, ` INSERT INTO `zz_views` (`id`, `id_module`, `name`, `query`, `order`, `search`, `slow`, `format`, `search_inside`, `order_by`, `enabled`, `summable`, `default` ) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Tipi di intervento'), 'Tempo standard', 'in_tipiintervento.tempo_standard', 10, 1, 0, 1, '', '', 0, 0, 0); - -- Disabilito temporaneamente le stampe degli ordini di servizio, plugins disabilitati UPDATE `zz_prints` SET `enabled` = 0 WHERE `name` IN( 'Ordine di servizio', 'Ordine di servizio (senza costi)' ); + +-- Fix colonna delle stampe +UPDATE `zz_views` SET `query` = '\'Intervento\'' WHERE `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Interventi') AND `name` = '_print_';