Skip to content

Commit 7992319

Browse files
authored
Merge pull request #87 from proditis/master
minor corrections
2 parents bc1d6d2 + f8f9623 commit 7992319

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

htdocs/protected/modules/settings/controllers/HostController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ public function actionDelete($id)
131131
try
132132
{
133133

134-
$this->loadModel ( $id )->delete ();
135-
Yii::app()->db->createCommand()->delete('syslog','host=:host',array(':host'=>$id));
134+
Yii::app()->db->createCommand()->delete('host','id=:host',array(':host'=>$id));
135+
Yii::app()->db->createCommand()->delete('syslog','host=:host',array(':host'=>$id));
136136
Yii::app()->db->createCommand()->delete('archive','host=:host',array(':host'=>$id));
137137
$trans->commit ();
138138
Yii::app()->user->addFlash('info',"<strong>Host deleted</strong>");

htdocs/protected/modules/settings/views/host/view.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
array('label'=>'Create Host','url'=>array('create')),
1010
array('label'=>'Update Host','url'=>array('update','id'=>$model->id)),
1111
array('label'=>'Resolve Host','url'=>'#','linkOptions'=>array('submit'=>array('resolve','id'=>$model->id))),
12-
array('label'=>'Delete Host','url'=>'#','linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')),
12+
array('label'=>'Delete Host','url'=>'#','linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Deleting this host will also purge its log entries. Are you sure you want to delete this item?')),
1313
);
1414
?>
1515

0 commit comments

Comments
 (0)