Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29009 from lamrani002/fixInDictMB

Browse Source 
Fix condition in  createDictionary for modulebuilder
This commit is contained in:
Laurent Destailleur 2024-03-28 15:12:07 +01:00 committed by GitHub
commit 7ba40287ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/modulebuilder.lib.php
View File

@ -1288,7 +1288,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
}
$columns = array(
'rowid' => array('type' => 'integer', 'value' => 11, 'extra' => 'AUTO_INCREMENT PRIMARY KEY'),
'rowid' => array('type' => 'integer', 'value' => 11, 'extra' => 'AUTO_INCREMENT'),
'code' => array('type' => 'varchar', 'value' => 255, 'null'=>'NOT NULL'),
'label' => array('type' => 'varchar', 'value' => 255, 'null'=>'NOT NULL'),
'position' => array('type' => 'integer', 'value' => 11, 'null'=>'NULL'),
@ -1310,9 +1310,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
}
// check if tablename exist in Database and create it if not
// @FIXME We must use $db->DDLDescTable($table) to know if a table exists.
$query = "SHOW TABLES LIKE '" . $db->escape(MAIN_DB_PREFIX.strtolower($namedic)) . "'";
$checkTable = $db->query($query);
$checkTable = $db->DDLDescTable(MAIN_DB_PREFIX.strtolower($namedic));
if ($checkTable && $db->num_rows($checkTable) > 0) {
setEventMessages($langs->trans("ErrorTableExist", $namedic), null, 'errors');
return;

3
htdocs/modulebuilder/index.php
View File

@ -2102,8 +2102,7 @@ if (($dirins && $action == 'confirm_deletedictionary' && $dicname) || ($dirins &
}
//chercher la table dicname
$query = "SHOW TABLES LIKE '" . MAIN_DB_PREFIX.strtolower($newdicname) . "'";
$checkTable = $db->query($query);
$checkTable = $db->DDLDescTable(MAIN_DB_PREFIX.strtolower($newdicname));
if ($checkTable && $db->num_rows($checkTable) <= 0) {
$error++;
}