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

Merge pull request #13681 from frederic34/patch-6

Browse Source 
fix phpunit usergroup class
This commit is contained in:
Laurent Destailleur 2020-04-22 00:39:18 +02:00 committed by GitHub
commit 39345a574e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/user/class/usergroup.class.php
View File

@ -654,6 +654,9 @@ class UserGroup extends CommonObject
global $user, $conf; global $user, $conf;
$this->datec = dol_now(); $this->datec = dol_now();
if (empty($this->nom) && !empty($this->name)) {
$this->nom = $this->name;
}
if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
$entity = $this->entity; $entity = $this->entity;

4
htdocs/user/group/card.php
View File

@ -132,7 +132,7 @@ if (empty($reshook)) {
$action = "create"; // Go back to create page $action = "create"; // Go back to create page
} else { } else {
$object->name = trim(GETPOST("nom", 'nohtml')); $object->name = trim(GETPOST("nom", 'nohtml'));
$object->nom = $object->name; // For backward compatibility //$object->nom = $object->name; // For backward compatibility
$object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'none'))); $object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form
@ -215,7 +215,7 @@ if (empty($reshook)) {
$object->oldcopy = clone $object; $object->oldcopy = clone $object;
$object->name = trim(GETPOST("nom", 'nohtml')); $object->name = trim(GETPOST("nom", 'nohtml'));
$object->nom = $object->name; // For backward compatibility //$object->nom = $object->name; // For backward compatibility
$object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'none'))); $object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form