Loading admin/src/BddAdmin/Table.php +8 −2 Changes for admin/src/BddAdmin/Table.php: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -424,9 +424,13 @@ class Table $bdd = $this->getBdd(); $histoUserId = (int)$bdd->getOption('histo-user-id'); $hasHistorique = $this->hasHistorique(); $diff = []; if (empty($options['where']) && $hasHistorique){ $options['where'] = 'HISTO_DESTRUCTION IS NULL'; } $diff = []; /* Chargement des données actuelles, à mettre à jour */ $oldData = $this->select($options['where'], $options); Loading @@ -434,8 +438,10 @@ class Table if (!isset($diff[$k])) { $diff[$k] = ['old' => [], 'new' => []]; } if (!($hasHistorique && $d['HISTO_DESTRUCTION'])){ $diff[$k]['old'] = $d; } } /* Mise en forme des nouvelles données */ Loading Loading @@ -471,7 +477,7 @@ class Table $this->insert($new); $result['insert']++; } } elseif (empty($new) && $options['soft-delete'] && $this->hasHistorique() && $histoUserId) { // SOFT DELETE } elseif (empty($new) && $options['soft-delete'] && $hasHistorique && $histoUserId) { // SOFT DELETE //On ne delete pas mais on historise $new = $old; $new['HISTO_DESTRUCTEUR_ID'] = $histoUserId; Loading Loading
admin/src/BddAdmin/Table.php +8 −2 Changes for admin/src/BddAdmin/Table.php: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -424,9 +424,13 @@ class Table $bdd = $this->getBdd(); $histoUserId = (int)$bdd->getOption('histo-user-id'); $hasHistorique = $this->hasHistorique(); $diff = []; if (empty($options['where']) && $hasHistorique){ $options['where'] = 'HISTO_DESTRUCTION IS NULL'; } $diff = []; /* Chargement des données actuelles, à mettre à jour */ $oldData = $this->select($options['where'], $options); Loading @@ -434,8 +438,10 @@ class Table if (!isset($diff[$k])) { $diff[$k] = ['old' => [], 'new' => []]; } if (!($hasHistorique && $d['HISTO_DESTRUCTION'])){ $diff[$k]['old'] = $d; } } /* Mise en forme des nouvelles données */ Loading Loading @@ -471,7 +477,7 @@ class Table $this->insert($new); $result['insert']++; } } elseif (empty($new) && $options['soft-delete'] && $this->hasHistorique() && $histoUserId) { // SOFT DELETE } elseif (empty($new) && $options['soft-delete'] && $hasHistorique && $histoUserId) { // SOFT DELETE //On ne delete pas mais on historise $new = $old; $new['HISTO_DESTRUCTEUR_ID'] = $histoUserId; Loading