diff --git a/module/admin/control.php b/module/admin/control.php index 62b0c50c99..1ac7b4a825 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -26,16 +26,6 @@ class admin extends control /* 首页。*/ public function index($tab = 'index') { - $this->locate(inlink('browseCompany')); - } - - /* 公司列表。*/ - public function browseCompany() - { - $this->view->header->title = $this->lang->admin->common . $this->lang->colon . $this->lang->company->browse; - $this->view->position[] = $this->lang->admin->company; - $this->view->position[] = $this->lang->company->browse; - $this->view->companies = $this->loadModel('company')->getList(); - $this->display(); + $this->locate($this->createLink('action', 'trash')); } } diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 3db4308bd5..6e5e21541f 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -163,9 +163,11 @@ $lang->testtask->menu->testcase = array('link' => '用例管理|testcase|browse| $lang->testtask->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases'); /* 组织结构视图菜单设置。*/ +$lang->company->menu->name = '%s' . $lang->arrow; $lang->company->menu->browseUser = array('link' => '用户列表|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => '部门维护|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => '权限分组|group|browse', 'subModule' => 'group'); +$lang->company->menu->edit = array('link' => '公司管理|company|edit'); $lang->company->menu->addGroup = array('link' => '添加分组|group|create', 'float' => 'right'); $lang->company->menu->addUser = array('link' => '添加用户|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right'); $lang->dept->menu = $lang->company->menu; @@ -181,13 +183,11 @@ $lang->user->menu->profile = array('link' => '用户信息|user|profile|account $lang->user->menu->browse = array('link' => '用户管理|company|browse|', 'float' => 'right'); /* 后台管理菜单设置。*/ -$lang->admin->menu->browseCompany = array('link' => '公司管理|admin|browsecompany', 'subModule' => 'company'); -$lang->admin->menu->convert = array('link' => '从其他系统导入|convert|index', 'subModule' => 'convert'); -$lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action'); -$lang->admin->menu->createCompany = array('link' => '新增公司|company|create', 'float' => 'right'); -$lang->convert->menu = $lang->admin->menu; -$lang->upgrade->menu = $lang->admin->menu; -$lang->action->menu = $lang->admin->menu; +$lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action'); +$lang->admin->menu->convert = array('link' => '从其他系统导入|convert|index', 'subModule' => 'convert'); +$lang->convert->menu = $lang->admin->menu; +$lang->upgrade->menu = $lang->admin->menu; +$lang->action->menu = $lang->admin->menu; /*菜单设置：分组设置。*/ $lang->menugroup->release = 'product'; @@ -195,7 +195,6 @@ $lang->menugroup->story = 'product'; $lang->menugroup->productplan = 'product'; $lang->menugroup->task = 'project'; $lang->menugroup->build = 'project'; -$lang->menugroup->company = 'admin'; $lang->menugroup->convert = 'admin'; $lang->menugroup->upgrade = 'admin'; $lang->menugroup->user = 'company'; diff --git a/module/company/control.php b/module/company/control.php index 3dc03eacb6..2b8e526cae 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -27,9 +27,9 @@ class company extends control public function __construct() { parent::__construct(); - $this->loadModel('admin'); $this->loadModel('dept'); $this->app->loadLang('user'); + $this->company->setMenu(); } /* 公司首页。*/ @@ -82,24 +82,20 @@ class company extends control } /* 编辑一个公司。*/ - public function edit($companyID) + public function edit() { if(!empty($_POST)) { - $this->company->update($companyID); + $this->company->update(); if(dao::isError()) die(js::error(dao::getError())); - die(js::locate($this->createLink('admin', 'browsecompany'), 'parent')); + die(js::alert($this->lang->company->successSaved)); } - $this->lang->set('menugroup.company', 'admin'); - $this->lang->company->menu = $this->lang->admin->menu; - - $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->company->edit; - $position[] = html::a($this->createLink('admin', 'browsecompany'), $this->lang->admin->company); + $header['title'] = $this->lang->company->common . $this->lang->colon . $this->lang->company->edit; $position[] = $this->lang->company->edit; $this->assign('header', $header); $this->assign('position', $position); - $this->assign('company', $this->company->getById($companyID)); + $this->assign('company', $this->company->getById($this->app->company->id)); $this->display(); } diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index dd7ee2eb1e..6f03f2abb9 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -32,7 +32,8 @@ $lang->company->browse = "用户列表"; $lang->company->depts = "部门列表"; $lang->company->orgView = '组织视图'; -$lang->company->confirmDelete = "您确定删除该公司吗？"; +$lang->company->confirmDelete = "您确定删除该公司吗？"; +$lang->company->successSaved = "成功保存"; $lang->company->id = '编号'; $lang->company->name = '公司名称'; diff --git a/module/company/model.php b/module/company/model.php index b10b32e751..1b9fcd5121 100644 --- a/module/company/model.php +++ b/module/company/model.php @@ -28,6 +28,7 @@ class companyModel extends model /* ò˵*/ public function setMenu($dept = 0) { + common::setMenuVars($this->lang->company->menu, 'name', array($this->app->company->name)); common::setMenuVars($this->lang->company->menu, 'addUser', array($dept)); } @@ -75,9 +76,10 @@ class companyModel extends model } /* һ˾Ϣ*/ - public function update($companyID) + public function update() { - $company = fixer::input('post')->get(); + $company = fixer::input('post')->get(); + $companyID = $this->app->company->id; $this->dao->update(TABLE_COMPANY) ->data($company) ->autoCheck() diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index 33231f0bea..b1655bb193 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -26,7 +26,7 @@
- + diff --git a/module/dept/control.php b/module/dept/control.php index 32b4d94eaa..d72897936a 100644 --- a/module/dept/control.php +++ b/module/dept/control.php @@ -25,6 +25,12 @@ class dept extends control { const NEW_CHILD_COUNT = 5; + public function __construct() + { + parent::__construct(); + $this->loadModel('company')->setMenu(); + } + /* 部门列表。*/ public function browse($deptID = 0) { diff --git a/module/group/control.php b/module/group/control.php index 7d93fdbace..3583d95f95 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -27,7 +27,7 @@ class group extends control public function __construct() { parent::__construct(); - $this->loadModel('admin'); + $this->loadModel('company')->setMenu(); $this->loadModel('user'); } @@ -114,7 +114,6 @@ class group extends control $groupPrivs = $this->group->getPrivs($groupID); $this->view->header->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->managePriv; - $this->view->position[] = html::a($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), $this->lang->admin->group); $this->view->position[] = $group->name . $this->lang->colon . $this->lang->group->managePriv; $this->view->group = $group; @@ -138,8 +137,7 @@ class group extends control $groupUsers = join(',', array_keys($groupUsers)); $allUsers = $this->user->getPairs('noclosed|noempty|noletter'); - $header['title'] = $this->lang->admin->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember; - $position[] = html::a($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), $this->lang->admin->group); + $header['title'] = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember; $position[] = $group->name . $this->lang->colon . $this->lang->group->manageMember; $this->assign('header', $header); diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 5f98d6f213..97ae87280d 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -193,9 +193,7 @@ $lang->resource->testtask->results = 'results'; /* 组织视图。*/ $lang->resource->company->index = 'index'; $lang->resource->company->browse = 'browse'; -$lang->resource->company->create = 'create'; $lang->resource->company->edit = 'edit'; -$lang->resource->company->delete = 'delete'; /* 部门。*/ $lang->resource->dept->browse = 'browse'; @@ -235,13 +233,12 @@ $lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu'; $lang->resource->search->buildForm = 'buildForm'; $lang->resource->search->buildQuery = 'buildQuery'; +/* 后台管理。*/ +$lang->resource->admin->index = 'index'; + /* 其他的一些杂项。*/ $lang->resource->api->getModel = 'getModel'; $lang->resource->file->download = 'download'; $lang->resource->misc->ping = 'ping'; $lang->resource->action->trash = 'trash'; $lang->resource->action->undelete = 'undelete'; - -/* 后台管理。*/ -$lang->resource->admin->index = 'index'; -$lang->resource->admin->browseCompany = 'browseCompany'; diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 908a32859e..467d4f921d 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -25,7 +25,11 @@
company->create;?>company->edit;?>
company->name;?> name, "class='text-1'");?>
- + + @@ -38,7 +42,7 @@ -
+
group->browse;?>
+
group->create);?>
+
group->id;?> group->name;?> group->desc;?>name;?> desc;?> id] as $user) echo $user . ' ';?> + id", $lang->group->managePriv);?> id", $lang->group->manageMember);?> id", $lang->edit);?> @@ -48,6 +52,5 @@
-
createLink('group', 'create'), $lang->group->create);?>
diff --git a/module/group/view/managepriv.html.php b/module/group/view/managepriv.html.php index 0fc6f08c33..abf2a1d266 100644 --- a/module/group/view/managepriv.html.php +++ b/module/group/view/managepriv.html.php @@ -42,19 +42,21 @@ function checkall(checker)
- - - +
name . $lang->colon . $lang->group->managePriv;?>
+ + resource as $moduleName => $moduleActions):?> - - '> + diff --git a/module/user/control.php b/module/user/control.php index 10083e695a..6e123c5a8f 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -29,7 +29,7 @@ class user extends control public function __construct() { parent::__construct(); - $this->loadModel('admin'); + $this->loadModel('company')->setMenu(); $this->loadModel('dept'); } @@ -198,8 +198,7 @@ class user extends control die(js::locate($this->createLink('company', 'browse'), 'parent')); } - $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->user->create; - $position[] = html::a($this->createLink('admin', 'browseuser') , $this->lang->admin->user); + $header['title'] = $this->lang->company->common . $this->lang->colon . $this->lang->user->create; $position[] = $this->lang->user->create; $this->assign('header', $header); $this->assign('position', $position); @@ -228,7 +227,7 @@ class user extends control } } - $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->user->edit; + $header['title'] = $this->lang->company->common . $this->lang->colon . $this->lang->user->edit; $position[] = $this->lang->user->edit; $this->assign('header', $header); $this->assign('position', $position);
name . $lang->colon . $lang->group->managePriv;?>
group->module;?> group->method;?>
lang->$moduleName->common;?> - - $actionLabel):?> - /> $moduleName->$actionLabel;?> - +
lang->$moduleName->common;?> + + + $actionLabel):?> +
/> $moduleName->$actionLabel;?>
+ "; $i ++;?> +