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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source 
* Task #5423
This commit is contained in:
yfl
2019-05-06 16:33:10 +08:00
parent 9e3477100a e29bb78fd3
commit 6db8a4e7b2
13 changed files with 538 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/zh-cn.php
+110 -33
View File
@@ -204,39 +204,116 @@ $lang->action->label->linked2bug = "关联了";
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass;
$lang->action->dynamicAction->product['opened'] = '创建';
$lang->action->dynamicAction->product['edited'] = '编辑';
$lang->action->dynamicAction->product['deleted'] = '删除';
$lang->action->dynamicAction->product['closed'] = '关闭';
$lang->action->dynamicAction->story['opened'] = '创建';
$lang->action->dynamicAction->story['edited'] = '编辑';
$lang->action->dynamicAction->story['deleted'] = '删除';
$lang->action->dynamicAction->story['changed'] = '变更';
$lang->action->dynamicAction->story['changed'] = '变更';
$lang->action->dynamicAction->story['linked2project'] = "关联{$lang->projectCommon}";
$lang->action->dynamicAction->story['unlinkedfromproject'] = "移除{$lang->projectCommon}";
$lang->action->dynamicAction->story['subdividestory'] = $lang->action->label->subdividestory;
$lang->action->dynamicAction->story['unlinkchildstory'] = $lang->action->label->unlinkchildstory;
$lang->action->dynamicAction->story['undeleted'] = '还原';
$lang->action->dynamicAction->story['hidden'] = '隐藏';
$lang->action->dynamicAction->project['opened'] = '创建';
$lang->action->dynamicAction->project['edited'] = '编辑';
$lang->action->dynamicAction->project['deleted'] = '删除';
$lang->action->dynamicAction->project['closed'] = '关闭';
$lang->action->dynamicAction->project['activated'] = '激活';
$lang->action->dynamicAction->task['opened'] = '创建';
$lang->action->dynamicAction->task['edited'] = '编辑';
$lang->action->dynamicAction->task['deleted'] = '删除';
$lang->action->dynamicAction->bug['opened'] = '创建';
$lang->action->dynamicAction->bug['edited'] = '编辑';
$lang->action->dynamicAction->bug['deleted'] = '删除';
$lang->action->dynamicAction->bug['resolved'] = '解决';
$lang->action->dynamicAction->bug['bugconfirmed'] = '确认';
$lang->action->dynamicAction->bug['assigned'] = '指派';
$lang->action->dynamicAction->bug['activated'] = '激活';
$lang->action->dynamicAction->doc['opened'] = '创建';
$lang->action->dynamicAction->doc['edited'] = '编辑';
$lang->action->dynamicAction->doc['deleted'] = '删除';
$lang->action->dynamicAction->todo['opened'] = '创建待办';
$lang->action->dynamicAction->todo['edited'] = '编辑待办';
$lang->action->dynamicAction->todo['erased'] = '删除待办';
$lang->action->dynamicAction->todo['finished'] = '完成待办';
$lang->action->dynamicAction->todo['activated'] = '激活待办';
$lang->action->dynamicAction->todo['closed'] = '关闭待办';
$lang->action->dynamicAction->todo['deleted'] = '删除待办';
$lang->action->dynamicAction->todo['assigned'] = '指派';
$lang->action->dynamicAction->product['opened'] = '创建' . $lang->productCommon;
$lang->action->dynamicAction->product['deleted'] = '删除' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = '编辑' . $lang->productCommon;
$lang->action->dynamicAction->product['closed'] = '关闭' . $lang->productCommon;
$lang->action->dynamicAction->productplan['opened'] = '创建产品计划';
$lang->action->dynamicAction->productplan['edited'] = '编辑产品计划';
$lang->action->dynamicAction->release['opened'] = '创建发布';
$lang->action->dynamicAction->release['edited'] = '编辑发布';
$lang->action->dynamicAction->release['changestatus'] = '修改状态';
$lang->action->dynamicAction->story['opened'] = '创建需求';
$lang->action->dynamicAction->story['edited'] = '编辑需求';
$lang->action->dynamicAction->story['activated'] = '激活需求';
$lang->action->dynamicAction->story['reviewed'] = '评审需求';
$lang->action->dynamicAction->story['closed'] = '关闭需求';
$lang->action->dynamicAction->story['assigned'] = '指派';
$lang->action->dynamicAction->story['closed'] = '关闭需求';
$lang->action->dynamicAction->story['linked2plan'] = '需求关联计划';
$lang->action->dynamicAction->story['unlinkedfromplan'] = '计划移除需求';
$lang->action->dynamicAction->story['linked2release'] = '需求关联发布';
$lang->action->dynamicAction->story['unlinkedfromrelease'] = '发布移除需求';
$lang->action->dynamicAction->story['linked2build'] = '需求关联版本';
$lang->action->dynamicAction->story['unlinkedfrombuild'] = '版本移除需求';
$lang->action->dynamicAction->story['unlinkedfromproject'] = '移除项目';
$lang->action->dynamicAction->project['opened'] = '创建项目';
$lang->action->dynamicAction->project['undeleted'] = '删除项目';
$lang->action->dynamicAction->project['edited'] = '编辑项目';
$lang->action->dynamicAction->project['started'] = '开始项目';
$lang->action->dynamicAction->project['delayed'] = '延期项目';
$lang->action->dynamicAction->project['suspended'] = '挂起项目';
$lang->action->dynamicAction->project['activated'] = '激活项目';
$lang->action->dynamicAction->project['closed'] = '关闭项目';
$lang->action->dynamicAction->project['managed'] = '维护项目';
$lang->action->dynamicAction->task['opened'] = '创建任务';
$lang->action->dynamicAction->task['commented'] = '任务备注';
$lang->action->dynamicAction->task['edited'] = '编辑任务';
$lang->action->dynamicAction->task['assigned'] = '任务指派';
$lang->action->dynamicAction->task['confirmed'] = '任务确认';
$lang->action->dynamicAction->task['started'] = '开始任务';
$lang->action->dynamicAction->task['editestimate'] = '编辑记录';
$lang->action->dynamicAction->task['deleteestimate'] = '删除记录';
$lang->action->dynamicAction->task['finished'] = '任务完成';
$lang->action->dynamicAction->task['paused'] = '任务暂停';
$lang->action->dynamicAction->task['closed'] = '任务关闭';
$lang->action->dynamicAction->task['canceled'] = '任务取消';
$lang->action->dynamicAction->task['activated'] = '任务激活';
$lang->action->dynamicAction->task['createchildren'] = '创建子任务';
$lang->action->dynamicAction->task['unlinkparenttask'] = '取消关联父任务';
$lang->action->dynamicAction->task['linkparenttask'] = '关联父任务';
$lang->action->dynamicAction->task['linkchildtask'] = '关联子任务';
$lang->action->dynamicAction->task['recordestimate'] = '记录日志';
$lang->action->dynamicAction->task['moved'] = '移动任务';
$lang->action->dynamicAction->build['opened'] = '创建版本';
$lang->action->dynamicAction->build['edited'] = '编辑版本';
$lang->action->dynamicAction->bug['opened'] = '创建bug';
$lang->action->dynamicAction->bug['edited'] = '编辑bug';
$lang->action->dynamicAction->bug['totask'] = '转任务';
$lang->action->dynamicAction->bug['activated'] = '激活bug';
$lang->action->dynamicAction->bug['assigned'] = '激活bug';
$lang->action->dynamicAction->bug['tostory'] = '转需求';
$lang->action->dynamicAction->bug['closed'] = '关闭bug';
$lang->action->dynamicAction->bug['bugconfirmed'] = '确认Bug';
$lang->action->dynamicAction->bug['confirmed'] = '确认需求变动';
$lang->action->dynamicAction->bug['linked2plan'] = '关联计划';
$lang->action->dynamicAction->bug['resolved'] = '解决bug';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = '从计划中移除';
$lang->action->dynamicAction->bug['linked2release'] = '关联发布';
$lang->action->dynamicAction->bug['unlinkedfromrelease'] = '从发布中移除';
$lang->action->dynamicAction->bug['linked2bug'] = '关联到版本';
$lang->action->dynamicAction->bug['unlinkedfrombuild'] = '从版本中移除';
$lang->action->dynamicAction->testtask['started'] = '开始用例';
$lang->action->dynamicAction->testtask['activated'] = '激活用例';
$lang->action->dynamicAction->testtask['closed'] = '关闭用例';
$lang->action->dynamicAction->testtask['blocked'] = '阻塞用例';
$lang->action->dynamicAction->testtask['edited'] = '编辑用例';
$lang->action->dynamicAction->testtask['opened'] = '创建用例';
$lang->action->dynamicAction->case['opened'] = '创建用例';
$lang->action->dynamicAction->case['edited'] = '编辑用例';
$lang->action->dynamicAction->case['reviewed'] = '记录评审结果';
$lang->action->dynamicAction->case['confirmed'] = '确认用例';
$lang->action->dynamicAction->case['fromlib'] = '从用例库导入';
$lang->action->dynamicAction->testreport['opened'] = '创建测试报告';
$lang->action->dynamicAction->testreport['edited'] = '编辑测试报告';
$lang->action->dynamicAction->testsuite['opened'] = '创建测试套件';
$lang->action->dynamicAction->caselib['opened'] = '创建用例库';
$lang->action->dynamicAction->docLib['created'] = '创建文档库';
$lang->action->dynamicAction->docLib['edited'] = '编辑文档库';
$lang->action->dynamicAction->doc['created'] = '创建文档';
$lang->action->dynamicAction->doc['edited'] = '编辑文档';
$lang->action->dynamicAction->doc['commented'] = '评论文档';
$lang->action->dynamicAction->user['login'] = '用户登录';
$lang->action->dynamicAction->user['created'] = '创建用户';
$lang->action->dynamicAction->user['edited'] = '编辑用户';
$lang->action->dynamicAction->user['logout'] = '用户退出';
$lang->action->dynamicAction->user['loginxuanxuan'] = '登录喧喧';
$lang->action->dynamicAction->entry['created'] = '添加应用';
$lang->action->dynamicAction->entry['edited'] = '编辑应用';
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
module/action/model.php
+7 -7
View File
@@ -616,15 +616,15 @@ class actionModel extends model
$libs = $this->doc->getLibs('all');
$docs = $this->doc->getPrivDocs(array_keys($libs));
$setDynamicActions = array();
$actions = '';
if(isset($this->config->global->setdynamic) and $this->config->global->setdynamic != 'false')
$actionCondition = '';
if(isset($this->app->user->rights['acls']['actions']))
{
$setDynamicActions = json_decode($this->config->global->setdynamic, true);
foreach($setDynamicActions as $moudle => $action)
if(empty($this->app->user->rights['acls']['actions'])) return array();
foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
{
$actions .= implode(',', $action) . ',';
$actionCondition .= "(`objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
}
$actionCondition = trim($actionCondition, 'or ');
}
/* Get actions. */
@@ -644,7 +644,7 @@ class actionModel extends model
->beginIF($this->config->global->flow == 'onlyStory')->andWhere('objectType')->notin('bug,build,project,task,taskcase,testreport,testsuite,testtask')->fi()
->beginIF($this->config->global->flow == 'onlyTask')->andWhere('objectType')->notin('product,productplan,release,story,testcase,testreport,testsuite')->fi()
->beginIF($this->config->global->flow == 'onlyTest')->andWhere('objectType')->notin('project,productplan,release,story,task')->fi()
->beginIF(!empty($setDynamicActions))->andWhere('objectType')->in(array_keys($setDynamicActions))->andWhere('action')->in($actions)->fi()
->beginIF(!empty($actionCondition))->andWhere("($actionCondition)")->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll();