From c20d82499920c1c0028d681700e7b80770e884ac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 17 Feb 2022 19:30:18 +0100 Subject: [PATCH] Tables of module ticket are create only when module is enabled. --- htdocs/core/modules/modTicket.class.php | 5 +++++ .../tables/{llx_ticket.key.sql => llx_ticket-ticket.key.sql} | 0 .../mysql/tables/{llx_ticket.sql => llx_ticket-ticket.sql} | 0 ...afields.key.sql => llx_ticket_extrafields-ticket.key.sql} | 0 ...ket_extrafields.sql => llx_ticket_extrafields-ticket.sql} | 0 5 files changed, 5 insertions(+) rename htdocs/install/mysql/tables/{llx_ticket.key.sql => llx_ticket-ticket.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_ticket.sql => llx_ticket-ticket.sql} (100%) rename htdocs/install/mysql/tables/{llx_ticket_extrafields.key.sql => llx_ticket_extrafields-ticket.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_ticket_extrafields.sql => llx_ticket_extrafields-ticket.sql} (100%) diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index 01561b40b01..50922ed884e 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -320,6 +320,11 @@ class modTicket extends DolibarrModules { global $conf, $langs; + $result = $this->_load_tables('/install/mysql/tables/', 'ticket'); + if ($result < 0) { + return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default') + } + // Permissions $this->remove($options); diff --git a/htdocs/install/mysql/tables/llx_ticket.key.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_ticket.key.sql rename to htdocs/install/mysql/tables/llx_ticket-ticket.key.sql diff --git a/htdocs/install/mysql/tables/llx_ticket.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_ticket.sql rename to htdocs/install/mysql/tables/llx_ticket-ticket.sql diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_ticket_extrafields.key.sql rename to htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.key.sql diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_ticket_extrafields.sql rename to htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.sql