mirror of
https://gitlab.easter-eggs.com/ee/ldapsaisie.git
synced 2024-11-26 03:43:08 +01:00
LSldapObject : fix onModify triggers execution
This commit is contained in:
parent
ea5c120b75
commit
421d7f4dce
1 changed files with 13 additions and 11 deletions
|
@ -341,13 +341,24 @@ class LSldapObject {
|
|||
|
||||
// $this -> attrs[ {inNewData} ] -> fireEvent('before_modify')
|
||||
foreach($new_data as $attr_name => $attr_val) {
|
||||
if (!$this -> attrs[$attr_name] -> fireEvent('before_modify')) {
|
||||
if ($this -> attrs[$attr_name] -> isUpdate() && !$this -> attrs[$attr_name] -> fireEvent('before_modify')) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if ($this -> submitChange($idForm)) {
|
||||
LSdebug('Les modifications sont submitées');
|
||||
// Event After Modify
|
||||
if(!$this -> submitError) {
|
||||
$this -> fireEvent('after_modify');
|
||||
}
|
||||
|
||||
// $this -> attrs[*] => After Modify
|
||||
foreach($new_data as $attr_name => $attr_val) {
|
||||
if ($this -> attrs[$attr_name] -> isUpdate()) {
|
||||
$this -> attrs[$attr_name] -> fireEvent('after_modify');
|
||||
}
|
||||
}
|
||||
$this -> submitError = false;
|
||||
$this -> reloadData();
|
||||
$this -> refreshForm($idForm);
|
||||
|
@ -356,15 +367,6 @@ class LSldapObject {
|
|||
return;
|
||||
}
|
||||
|
||||
// Event After Modify
|
||||
if(!$this -> submitError) {
|
||||
$this -> fireEvent('after_modify');
|
||||
}
|
||||
|
||||
// $this -> attrs[*] => After Modify
|
||||
foreach($new_data as $attr_name => $attr_val) {
|
||||
$this -> attrs[$attr_name] -> fireEvent('after_modify');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Reference in a new issue