Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust the company view.

Browse Source
This commit is contained in:
wangchunsheng
2010-04-14 07:30:56 +00:00
parent 1344a735f3
commit 00c653068a
12 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/admin/control.php
View File

@@ -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'));
}
}

15
module/common/lang/zh-cn.php
View File

@@ -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';

16
module/company/control.php
View File

@@ -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();
}

3
module/company/lang/zh-cn.php
View File

@@ -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 = '公司名称';

6
module/company/model.php
View File

@@ -28,6 +28,7 @@ class companyModel extends model
/* <20><><EFBFBD>ò˵<C3B2><CBB5><EFBFBD>*/
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
}
/* <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>˾<EFBFBD><CBBE>Ϣ<EFBFBD><CFA2>*/
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()

2
module/company/view/edit.html.php
View File

@@ -26,7 +26,7 @@
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-5'>
<caption><?php echo $lang->company->create;?></caption>
<caption><?php echo $lang->company->edit;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->company->name;?></th>
<td><?php echo html::input('name', $company->name, "class='text-1'");?></td>

6
module/dept/control.php
View File

@@ -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)
{

6
module/group/control.php
View File

@@ -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);

9
module/group/lang/zh-cn.php
View File

@@ -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';

9
module/group/view/browse.html.php
View File

@@ -25,7 +25,11 @@
<?php include '../../common/view/header.html.php';?>
<div class='yui-d0'>
<table align='center' class='table-1'>
<tr class='colhead nobr'>
<caption class='caption-tl'>
<div class='f-left'><?php echo $lang->group->browse;?></div>
<div class='f-right'><?php echo html::a(inlink('create'), $lang->group->create);?></div>
</caption>
<tr class='colhead'>
<th><?php echo $lang->group->id;?></th>
<th><?php echo $lang->group->name;?></th>
<th><?php echo $lang->group->desc;?></th>
@@ -38,7 +42,7 @@
<td><?php echo $group->name;?></td>
<td class='a-left'><?php echo $group->desc;?></td>
<td class='a-left'><?php foreach($groupUsers[$group->id] as $user) echo $user . ' ';?></td>
<td class='nobr'>
<td>
<?php common::printLink('group', 'managepriv', "groupID=$group->id", $lang->group->managePriv);?>
<?php common::printLink('group', 'managemember', "groupID=$group->id", $lang->group->manageMember);?>
<?php common::printLink('group', 'edit', "groupID=$group->id", $lang->edit);?>
@@ -48,6 +52,5 @@
</tr>
<?php endforeach;?>
</table>
<div class='a-right'><?php echo html::a($this->createLink('group', 'create'), $lang->group->create);?></div>
</div>
<?php include '../../common/view/footer.html.php';?>

20
module/group/view/managepriv.html.php
View File

@@ -42,19 +42,21 @@ function checkall(checker)
</script>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-1 a-left'>
<caption><?php echo $group->name . $lang->colon . $lang->group->managePriv;?></caption>
<tr class='nobr'>
<table class='table-1 a-left'>
<caption class='caption-tl'><?php echo $group->name . $lang->colon . $lang->group->managePriv;?></caption>
<tr class='colhead'>
<th><?php echo $lang->group->module;?></th>
<th><?php echo $lang->group->method;?></th>
</tr>
<?php foreach($lang->resource as $moduleName => $moduleActions):?>
<tr>
<th class='rowhead'><?php echo $this->lang->$moduleName->common;?> <input type='checkbox' onclick='check(this, "<?php echo $moduleName;?>")'></td>
<td id='<?php echo $moduleName;?>'>
<?php foreach($moduleActions as $action => $actionLabel):?>
<input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked";?> /> <?php echo $lang->$moduleName->$actionLabel;?>
<?php endforeach;?>
<tr class='f-14px <?php echo cycle('even, bg-yellow');?>'>
<th class='a-right'><?php echo $this->lang->$moduleName->common;?> <input type='checkbox' onclick='check(this, "<?php echo $moduleName;?>")'></td>
<td id='<?php echo $moduleName;?>' class='pv-10px'>
<?php $i = 1;?>
<?php foreach($moduleActions as $action => $actionLabel):?>
<div class='w-p20 f-left'><input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked";?> /> <?php echo $lang->$moduleName->$actionLabel;?></div>
<?php if(($i % 4) == 0) echo "<div class='c-both'></div>"; $i ++;?>
<?php endforeach;?>
</td>
</tr>
<?php endforeach;?>

7
module/user/control.php
View File

@@ -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);