diff options
Diffstat (limited to 'h-source/Application/Models')
| -rw-r--r-- | h-source/Application/Models/HardwareModel.php | 7 | ||||
| -rw-r--r-- | h-source/Application/Models/HistoryModel.php | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/h-source/Application/Models/HardwareModel.php b/h-source/Application/Models/HardwareModel.php index 1c552c0..7d5060c 100644 --- a/h-source/Application/Models/HardwareModel.php +++ b/h-source/Application/Models/HardwareModel.php @@ -74,11 +74,16 @@ class HardwareModel extends Model_Map { public function permanentlyDelete($id) { + $clean['id'] = (int)$id; + + $record = $this->selectId($clean['id']); + $this->values['deleted'] = 'no'; $this->values['approved'] = 'yes'; $this->values['pci_id'] = ''; + $this->values['model'] = '[permanently deleted] '.$record['model']; - return parent::update($id); + return parent::update($clean['id']); } public function pUpdate($id) diff --git a/h-source/Application/Models/HistoryModel.php b/h-source/Application/Models/HistoryModel.php index 4e345ed..cf63dbe 100644 --- a/h-source/Application/Models/HistoryModel.php +++ b/h-source/Application/Models/HistoryModel.php @@ -29,6 +29,7 @@ class HistoryModel extends Model_Tree { $this->_where=array( 'approved' => 'hardware', 'deleted' => 'hardware', + 'cleared' => 'hardware', ); $this->orderBy = 'history.id_history'; |