diff --git a/module/repo/control.php b/module/repo/control.php index f37e9659a8..c2a35b74cc 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -86,6 +86,7 @@ class repo extends control $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link)); } + $this->repo->setMenu($this->repos, '', false); $this->app->loadLang('action'); $this->view->groups = $this->loadModel('group')->getPairs(); @@ -120,6 +121,7 @@ class repo extends control $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('maintain'))); } + $this->repo->setMenu($this->repos, $repo->id, false); $this->app->loadLang('action'); $repo->repoType = $repo->id . '-' . $repo->SCM; @@ -155,8 +157,8 @@ class repo extends control $this->dao->delete()->from(TABLE_REPOFILES)->where('repo')->eq($repoID)->exec(); $this->dao->delete()->from(TABLE_REPOBRANCH)->where('repo')->eq($repoID)->exec(); - if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); - $this->send(array('result' => 'success')); + if(dao::isError()) die(js::error(dao::getError())); + die(js::reload('parent')); } /** diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index 9c98cb26c8..6bbd968945 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -7,7 +7,6 @@ $lang->repo->createAction = 'Create Repo'; $lang->repo->edit = 'Edit'; $lang->repo->editAction = 'Edit Repo'; $lang->repo->delete = 'Delete Repo'; -$lang->repo->confirmDelete = 'Do you want to delete this repo?'; $lang->repo->showSyncComment = 'Display Synchronization'; $lang->repo->ajaxSyncComment = 'Interface: Ajax Sync Note'; $lang->repo->download = 'Download File'; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index eac67bc74d..dd747ef0ee 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -7,7 +7,6 @@ $lang->repo->createAction = '创建版本库'; $lang->repo->edit = '编辑'; $lang->repo->editAction = '编辑版本库'; $lang->repo->delete = '删除版本库'; -$lang->repo->confirmDelete = '确认删除该版本库吗?'; $lang->repo->showSyncComment = '显示同步进度'; $lang->repo->ajaxSyncComment = '接口:AJAX同步注释'; $lang->repo->download = '下载'; diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php index 63a2924f06..39d0d5d016 100644 --- a/module/repo/view/maintain.html.php +++ b/module/repo/view/maintain.html.php @@ -11,47 +11,39 @@ */ ?> -repo->confirmDelete); ?> - -