diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php index 031df715..4550e3b6 100755 --- a/application/admin/controllers/DataController.php +++ b/application/admin/controllers/DataController.php @@ -1740,11 +1740,11 @@ class Admin_DataController extends Zend_Controller_Action if($ex) { - $data = array("deleted"=>$id,"error"=>$this->alertbox('ok','删除成功')); + $data = array("deleted"=>$id, "error"=>"删除成功"); $this->jsonexit($data); return true; }else{ - $data = array("error"=>$this->alertbox('error','删除失败,请确认权限后重试')); + $data = array("error"=>'删除失败,请确认权限后重试'); $this->jsonexit($data); return true; } @@ -1752,7 +1752,7 @@ class Admin_DataController extends Zend_Controller_Action $msg = "删除失败,请确认权限后重试"; if($this->debug>0) {$msg .= $e->getMessage();} - $data = array("error"=>$this->alertbox('error',$msg)); + $data = array("error"=>$msg); $this->jsonexit($data); return true; } diff --git a/application/admin/views/scripts/data/version.phtml b/application/admin/views/scripts/data/version.phtml index 9079c067..2576b8de 100644 --- a/application/admin/views/scripts/data/version.phtml +++ b/application/admin/views/scripts/data/version.phtml @@ -77,12 +77,12 @@ function action(ac,id){ {$('#changelog').val('');$('#commit_submit').attr('onclick','');} } else{ - $.colorbox({'innerWidth':'50%','html':'