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

* change for group name .

Browse Source
This commit is contained in:
wangyidong
2012-12-24 06:24:54 +00:00
parent ed656ec09e
commit ff1bd9352f
7 changed files with 1586 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2433
db/zentao.sql
View File

File diff suppressed because it is too large Load Diff

26
module/group/lang/resource.php
View File

@@ -641,20 +641,20 @@ $lang->convert->methodOrder[45] = 'execute';
$lang->convert->methodOrder[50] = 'convertBugFree';
$lang->convert->methodOrder[55] = 'convertRedmine';
$lang->resource->webapp = new stdclass();
$lang->resource->webapp->index = 'index';
$lang->resource->webapp->obtain = 'obtain';
$lang->resource->webapp->create = 'create';
$lang->resource->webapp->edit = 'edit';
$lang->resource->webapp->install = 'install';
$lang->resource->webapp->uninstall = 'uninstall';
//$lang->resource->webapp = new stdclass();
//$lang->resource->webapp->index = 'index';
//$lang->resource->webapp->obtain = 'obtain';
//$lang->resource->webapp->create = 'create';
//$lang->resource->webapp->edit = 'edit';
//$lang->resource->webapp->install = 'install';
//$lang->resource->webapp->uninstall = 'uninstall';
$lang->webapp->methodOrder[5] = 'index';
$lang->webapp->methodOrder[10] = 'obtain';
$lang->webapp->methodOrder[15] = 'create';
$lang->webapp->methodOrder[20] = 'edit';
$lang->webapp->methodOrder[25] = 'install';
$lang->webapp->methodOrder[30] = 'uninstall';
//$lang->webapp->methodOrder[5] = 'index';
//$lang->webapp->methodOrder[10] = 'obtain';
//$lang->webapp->methodOrder[15] = 'create';
//$lang->webapp->methodOrder[20] = 'edit';
//$lang->webapp->methodOrder[25] = 'install';
//$lang->webapp->methodOrder[30] = 'uninstall';
/* Others. */
$lang->resource->api = new stdclass();

2
module/group/model.php
View File

@@ -104,7 +104,7 @@ class groupModel extends model
*/
public function getList($companyID)
{
return $this->dao->findByCompany($companyID)->from(TABLE_GROUP)->fetchAll();
return $this->dao->findByCompany($companyID)->from(TABLE_GROUP)->orderBy('id')->fetchAll();
}
/**

23
module/install/lang/en.php
View File

@@ -108,6 +108,29 @@ $lang->install->account = 'Administrator';
$lang->install->password = 'Admin password';
$lang->install->errorEmptyPassword = "Can't be empty";
$lang->install->groupList['ADMIN']['name'] = 'Administrator';
$lang->install->groupList['ADMIN']['desc'] = 'for administrator';
$lang->install->groupList['DEV']['name'] = 'Developer';
$lang->install->groupList['DEV']['desc'] = 'for developers';
$lang->install->groupList['QA']['name'] = 'tester';
$lang->install->groupList['QA']['desc'] = 'for testers';
$lang->install->groupList['PM']['name'] = 'Project manager';
$lang->install->groupList['PM']['desc'] = 'for project managers';
$lang->install->groupList['PO']['name'] = 'Product manager';
$lang->install->groupList['PO']['desc'] = 'for product managers';
$lang->install->groupList['TD']['name'] = 'Technical director';
$lang->install->groupList['TD']['desc'] = 'for technical director';
$lang->install->groupList['PD']['name'] = 'Product director';
$lang->install->groupList['PD']['desc'] = 'for product director';
$lang->install->groupList['QD']['name'] = 'Quality director';
$lang->install->groupList['QD']['desc'] = 'for quality director';
$lang->install->groupList['TOP']['name'] = 'Top manager';
$lang->install->groupList['TOP']['desc'] = 'for top manager';
$lang->install->groupList['OTHERS']['name'] = 'Others';
$lang->install->groupList['OTHERS']['desc'] = 'for others';
$lang->install->groupList['guest']['name'] = 'Guest';
$lang->install->groupList['guest']['desc'] = 'for guest';
$lang->install->success = "Success installed";
$lang->install->joinZentao = <<<EOT

23
module/install/lang/zh-cn.php
View File

@@ -108,6 +108,29 @@ $lang->install->account = '管理员帐号';
$lang->install->password = '管理员密码';
$lang->install->errorEmptyPassword = '密码不能为空';
$lang->install->groupList['ADMIN']['name'] = '管理员';
$lang->install->groupList['ADMIN']['desc'] = '系统管理员';
$lang->install->groupList['DEV']['name'] = '研发';
$lang->install->groupList['DEV']['desc'] = '研发人员';
$lang->install->groupList['QA']['name'] = '测试';
$lang->install->groupList['QA']['desc'] = '测试人员';
$lang->install->groupList['PM']['name'] = '项目经理';
$lang->install->groupList['PM']['desc'] = '项目经理';
$lang->install->groupList['PO']['name'] = '产品经理';
$lang->install->groupList['PO']['desc'] = '产品经理';
$lang->install->groupList['TD']['name'] = '研发主管';
$lang->install->groupList['TD']['desc'] = '研发主管';
$lang->install->groupList['PD']['name'] = '产品主管';
$lang->install->groupList['PD']['desc'] = '产品主管';
$lang->install->groupList['QD']['name'] = '测试主管';
$lang->install->groupList['QD']['desc'] = '测试主管';
$lang->install->groupList['TOP']['name'] = '高层管理';
$lang->install->groupList['TOP']['desc'] = '高层管理';
$lang->install->groupList['OTHERS']['name'] = '其他';
$lang->install->groupList['OTHERS']['desc'] = '其他';
$lang->install->groupList['guest']['name'] = '游客';
$lang->install->groupList['guest']['desc'] = '游客';
$lang->install->success = "安装成功";
$lang->install->joinZentao = <<<EOT

8
module/install/model.php
View File

@@ -406,6 +406,14 @@ class installModel extends model
/* Update the group and groupPriv table. */
$this->dao->update(TABLE_GROUP)->set('company')->eq($companyID)->exec($autoCompany = false);
$this->dao->update(TABLE_GROUPPRIV)->set('company')->eq($companyID)->exec($autoCompany = false);
/* Update group name and desc on dafault lang.*/
include('lang/' . $this->config->default->lang . '.php');
$groups = $this->dao->select('*')->from(TABLE_GROUP)->orderBy('id')->fetchAll();
foreach($groups as $group)
{
if(isset($lang->install->groupList[$group->name]))$this->dao->update(TABLE_GROUP)->data($lang->install->groupList[$group->name])->where('id')->eq($group->id)->exec();
}
}
}

2
module/user/lang/en.php
View File

@@ -86,7 +86,7 @@ $lang->user->roleList['dev'] = 'Developer';
$lang->user->roleList['qa'] = 'Tester';
$lang->user->roleList['pm'] = 'Project manager';
$lang->user->roleList['po'] = 'Product owner';
$lang->user->roleList['td'] = 'Technical directory';
$lang->user->roleList['td'] = 'Technical director';
$lang->user->roleList['pd'] = 'Product director';
$lang->user->roleList['qd'] = 'Quality Director';
$lang->user->roleList['top'] = 'Top manager';