lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error management

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-20 12:54:43 +01:00
parent 728bcf677e
commit 067663263a
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -10,7 +10,7 @@ For users:
NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6 NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6
NEW: #21780 Add pid field to Cronjob class and store PID on job execution NEW: #21780 Add pid field to Cronjob class and store PID on job execution
NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD to automatically have uploaded files shared publicly by a link
NEW: #20650 can move the checkbox column on left (experimental option) NEW: #20650 can move the checkbox column on left (experimental option)
NEW: #21000 Added columns 'alias_name' on poject, supplier invoice, supplier order, supplier proposals and taks list NEW: #21000 Added columns 'alias_name' on poject, supplier invoice, supplier order, supplier proposals and taks list
NEW: #21395 Added option for dark theme mode in display - color and theme NEW: #21395 Added option for dark theme mode in display - color and theme
@ -18,9 +18,8 @@ NEW: #21397 added option to auto define barcode numbers for third-parties in bar
NEW: #21399 NEW: #21399
NEW: #21442 Enhancement of module builder init NEW: #21442 Enhancement of module builder init
NEW: #21654 add bank account number used on invoices for debit NEW: #21654 add bank account number used on invoices for debit
NEW: #21775 Template 03 manages send mails
NEW: #22048 Added notes to productlot module NEW: #22048 Added notes to productlot module
NEW: #22298 Bank - Add salaries & vat in tab planned entries NEW: #22298 Bank - Add salaries & vat in the tab of planned entries of a bank account
NEW: #22328 NEW: #22328
NEW: #22424 NEW: #22424
NEW: #22500 member module set up made easier NEW: #22500 member module set up made easier
@ -55,7 +54,6 @@ NEW: Add hidden option MAIN_EMAIL_SUPPORT_ACK to restore Email ack checkbox (fea
NEW: Add IMAP port setting on email collector module NEW: Add IMAP port setting on email collector module
NEW: Adding JAPAN Chart-of-Account and regions/departments NEW: Adding JAPAN Chart-of-Account and regions/departments
NEW: Adding NIF verification for Algeria NEW: Adding NIF verification for Algeria
NEW: Add 4 other templates in website module
NEW: Add link to create an element from the category page NEW: Add link to create an element from the category page
NEW: add margin infos to takepos invoice lines NEW: add margin infos to takepos invoice lines
NEW: Add max size send for "backup and link to mail" option NEW: Add max size send for "backup and link to mail" option
@ -96,6 +94,7 @@ NEW: Website Can remove a website template
NEW: Website can set header "Strict-Transport-Security" in web sites. NEW: Website can set header "Strict-Transport-Security" in web sites.
NEW: Website Can switch status of website and page from the website toolbar NEW: Website Can switch status of website and page from the website toolbar
NEW: Website Templates of websites are now directories and not zip into core repo NEW: Website Templates of websites are now directories and not zip into core repo
NEW: Website Add 4 other templates in website module
NEW: Can use products categories to make inventory NEW: Can use products categories to make inventory
NEW: Change filter type on tickets list into a multiselect combo NEW: Change filter type on tickets list into a multiselect combo
NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line

7
htdocs/website/class/website.class.php
View File

@ -154,7 +154,7 @@ class Website extends CommonObject
* @param User $user User that creates * @param User $user User that creates
* @param bool $notrigger false=launch triggers after, true=disable triggers * @param bool $notrigger false=launch triggers after, true=disable triggers
* *
* @return int <0 if KO, Id of created object if OK * @return int <0 if KO, 0 if already exists, ID of created object if OK
*/ */
public function create(User $user, $notrigger = false) public function create(User $user, $notrigger = false)
{ {
@ -282,8 +282,11 @@ class Website extends CommonObject
// Commit or rollback // Commit or rollback
if ($error) { if ($error) {
$this->db->rollback(); $this->db->rollback();
if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
return 0;
} else {
return -1 * $error; return -1 * $error;
}
} else { } else {
$this->db->commit(); $this->db->commit();

5
htdocs/website/index.php
View File

@ -694,7 +694,10 @@ if ($action == 'addsite' && $usercanedit) {
$tmpobject->virtualhost = GETPOST('virtualhost', 'alpha'); $tmpobject->virtualhost = GETPOST('virtualhost', 'alpha');
$result = $tmpobject->create($user); $result = $tmpobject->create($user);
if ($result <= 0) { if ($result == 0) {
$error++;
setEventMessages($langs->trans("ErrorLabelAlreadyExists"), null, 'errors');
} elseif ($result < 0) {
$error++; $error++;
setEventMessages($tmpobject->error, $tmpobject->errors, 'errors'); setEventMessages($tmpobject->error, $tmpobject->errors, 'errors');
} }