bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-26 11:52:59 +01:00
Code Issues Projects Releases Wiki Activity

LSldapObject : fix onModify triggers execution

Browse source
This commit is contained in:
Benjamin Renard 2012-03-22 19:51:27 +01:00
parent ea5c120b75
commit 421d7f4dce
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
public_html/includes/class/class.LSldapObject.php
View file

@ -341,13 +341,24 @@ class LSldapObject {
// $this -> attrs[ {inNewData} ] -> fireEvent('before_modify') // $this -> attrs[ {inNewData} ] -> fireEvent('before_modify')
foreach($new_data as $attr_name => $attr_val) { 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; return;
} }
} }
if ($this -> submitChange($idForm)) { if ($this -> submitChange($idForm)) {
LSdebug('Les modifications sont submitées'); 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 -> submitError = false;
$this -> reloadData(); $this -> reloadData();
$this -> refreshForm($idForm); $this -> refreshForm($idForm);
@ -356,15 +367,6 @@ class LSldapObject {
return; 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; return true;
} }
else { else {