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

Merge pull request #13572 from frederic34/patch-8

Browse Source 
can't remove actioncomm if there is a category
This commit is contained in:
Laurent Destailleur 2020-04-12 17:09:27 +02:00 committed by GitHub
commit b2cf5ee9a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/comm/action/class/actioncomm.class.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2011-2017 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2017 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -898,23 +898,27 @@ class ActionComm extends CommonObject
$error = 0; $error = 0;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm"; // remove categorie association
$sql .= " WHERE id=".$this->id; if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_actioncomm";
$sql .= " WHERE fk_actioncomm=".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG); $res = $this->db->query($sql);
$res = $this->db->query($sql); if (!$res) {
if (!$res) { $this->error = $this->db->lasterror();
$this->error=$this->db->lasterror(); $error++;
$error++; }
} }
// remove actioncomm_resources
if (!$error) { if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources";
$sql .= " WHERE fk_actioncomm=".$this->id; $sql .= " WHERE fk_actioncomm=".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$res = $this->db->query($sql); $res = $this->db->query($sql);
if (!$res) { if (!$res) {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
@ -924,7 +928,7 @@ class ActionComm extends CommonObject
// Removed extrafields // Removed extrafields
if (!$error) { if (!$error) {
$result = $this->deleteExtraFields(); $result = $this->deleteExtraFields();
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
@ -932,6 +936,18 @@ class ActionComm extends CommonObject
} }
} }
// remove actioncomm
if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
$sql .= " WHERE id=".$this->id;
$res = $this->db->query($sql);
if (!$res) {
$this->error = $this->db->lasterror();
$error++;
}
}
if (!$error) if (!$error)
{ {
if (!$notrigger) if (!$notrigger)