Fix: La suppression d'un groupe ne fonctionnait pas si le groupe avait des permissions ou user affectés
This commit is contained in:
parent
32f6f27452
commit
dd17f8e1ca
@ -298,15 +298,27 @@ class UserGroup
|
|||||||
|
|
||||||
function delete()
|
function delete()
|
||||||
{
|
{
|
||||||
|
$this->db->begin();
|
||||||
|
|
||||||
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
|
||||||
|
$sql .= " WHERE fk_usergroup = ".$this->id;
|
||||||
|
$this->db->query($sql);
|
||||||
|
|
||||||
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
|
||||||
|
$sql .= " WHERE fk_usergroup = ".$this->id;
|
||||||
|
$this->db->query($sql);
|
||||||
|
|
||||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup";
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup";
|
||||||
$sql .= " WHERE rowid = ".$this->id;
|
$sql .= " WHERE rowid = ".$this->id;
|
||||||
$result=$this->db->query($sql);
|
$result=$this->db->query($sql);
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
|
$this->db->commit();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$this->db->rollback();
|
||||||
dolibarr_print_error($this->db);
|
dolibarr_print_error($this->db);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user