diff --git a/include/init/init.php b/include/init/init.php index cdb0b081b..294f03d34 100755 --- a/include/init/init.php +++ b/include/init/init.php @@ -111,7 +111,7 @@ if (post('action') == 'init') { if (!$has_settings) { foreach ($settings as $setting => $required) { - $setting = Setting::find($setting); + $setting = Setting::where('nome', '=', $setting)->first(); $value = post('setting')[$setting->id]; if (!empty($value)) { diff --git a/modules/import/add.php b/modules/import/add.php index 5bbf1a3af..072fbf39d 100755 --- a/modules/import/add.php +++ b/modules/import/add.php @@ -29,7 +29,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "select", "label": "", "name": "id_import", "required": 1, "values": "query=SELECT id, name AS text FROM zz_imports ORDER BY name" ]} + {[ "type": "select", "label": "", "name": "id_import", "required": 1, "values": "query=SELECT `zz_imports`.`id`, `zz_imports_lang`.`name` AS text FROM `zz_imports` LEFT JOIN `zz_imports_lang` ON (`zz_imports`.`id`=`zz_imports_lang`.`id_record` AND `zz_imports_lang`.`id_lang` = ) ORDER BY `name`" ]}
diff --git a/update/2_5.sql b/update/2_5.sql index f3300c2f1..d9faf507a 100644 --- a/update/2_5.sql +++ b/update/2_5.sql @@ -2205,4 +2205,25 @@ WHERE HAVING 2=2" WHERE `zz_modules`.`id` = (SELECT `id_record` FROM `zz_modules_lang` WHERE `name` = 'Stampe'); UPDATE `zz_views` LEFT JOIN `zz_views_lang` ON (`zz_views_lang`.`id_record` = `zz_views`.`id` AND `zz_views_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) INNER JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` LEFT JOIN `zz_modules_lang` ON (`zz_modules_lang`.`id_record` = `zz_modules`.`id` AND `zz_modules_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) SET `zz_views`.`query` = '`zz_prints_lang`.`title`' WHERE `zz_modules_lang`.`name` = 'Stampe' AND `zz_views_lang`.`name` = 'Titolo'; -UPDATE `zz_views` LEFT JOIN `zz_views_lang` ON (`zz_views_lang`.`id_record` = `zz_views`.`id` AND `zz_views_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) INNER JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` LEFT JOIN `zz_modules_lang` ON (`zz_modules_lang`.`id_record` = `zz_modules`.`id` AND `zz_modules_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) SET `zz_views`.`query` = '`zz_prints_lang`.`filename`' WHERE `zz_modules_lang`.`name` = 'Stampe' AND `zz_views_lang`.`name` = 'Nome del file'; \ No newline at end of file +UPDATE `zz_views` LEFT JOIN `zz_views_lang` ON (`zz_views_lang`.`id_record` = `zz_views`.`id` AND `zz_views_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) INNER JOIN `zz_modules` ON `zz_views`.`id_module` = `zz_modules`.`id` LEFT JOIN `zz_modules_lang` ON (`zz_modules_lang`.`id_record` = `zz_modules`.`id` AND `zz_modules_lang`.`id_lang` = (SELECT `valore` FROM `zz_settings` WHERE `nome` = "Lingua")) SET `zz_views`.`query` = '`zz_prints_lang`.`filename`' WHERE `zz_modules_lang`.`name` = 'Stampe' AND `zz_views_lang`.`name` = 'Nome del file'; + +-- Aggiunta tabella zz_imports_lang +CREATE TABLE IF NOT EXISTS `zz_imports_lang` ( + `id` int NOT NULL, + `id_lang` int NOT NULL, + `id_record` int NOT NULL, + `name` VARCHAR(255) NOT NULL +); + +ALTER TABLE `zz_imports_lang` + ADD PRIMARY KEY (`id`); + +ALTER TABLE `zz_imports_lang` + MODIFY `id` int NOT NULL AUTO_INCREMENT; + +INSERT INTO `zz_imports_lang` (`id`, `id_lang`, `id_record`, `name`) SELECT NULL, (SELECT `id` FROM `zz_langs` WHERE `iso_code` = 'it'), `id`, `name` FROM `zz_imports`; + +ALTER TABLE `zz_imports` + DROP `name`; + +ALTER TABLE `zz_imports_lang` ADD CONSTRAINT `zz_imports_lang_ibfk_1` FOREIGN KEY (`id_record`) REFERENCES `zz_imports`(`id`) ON DELETE CASCADE ON UPDATE RESTRICT; \ No newline at end of file diff --git a/update/tables.php b/update/tables.php index 2799f0908..e35b973a7 100755 --- a/update/tables.php +++ b/update/tables.php @@ -171,6 +171,7 @@ return [ 'zz_group_view', 'zz_hooks', 'zz_imports', + 'zz_imports_lang', 'zz_logs', 'zz_modules', 'zz_modules_lang',