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

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

Browse Source
This commit is contained in:
wangyidong
2019-05-07 10:49:36 +08:00
parent 7cf950a2eb e144fe8e37
commit e2fd154aca
3 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/zh-cn.php
+34 -14
View File
@@ -201,6 +201,10 @@ $lang->action->label->logout = "退出登录";
$lang->action->label->deleteestimate = "删除了工时";
$lang->action->label->linked2build = "关联了";
$lang->action->label->linked2bug = "关联了";
$lang->action->label->linkchildtask = "关联子任务";
$lang->action->label->unlinkchildrentask = "取消关联子任务";
$lang->action->label->linkparenttask = "关联父任务";
$lang->action->label->batchcreate = "批量创建任务";
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass;
@@ -211,17 +215,23 @@ $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->todo['assigned'] = '待办指派';
$lang->action->dynamicAction->todo['undeleted'] = '还原待办';
$lang->action->dynamicAction->todo['hidden'] = '隐藏待办';
$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['deleted'] = '删除' . $lang->productCommon;
$lang->action->dynamicAction->product['closed'] = '关闭' . $lang->productCommon;
$lang->action->dynamicAction->product['undeleted'] = '还原产品';
$lang->action->dynamicAction->product['hidden'] = '隐藏产品';
$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->release['undeleted'] = '还原发布';
$lang->action->dynamicAction->release['hidden'] = '隐藏发布';
$lang->action->dynamicAction->story['opened'] = '创建需求';
$lang->action->dynamicAction->story['edited'] = '编辑需求';
$lang->action->dynamicAction->story['activated'] = '激活需求';
@@ -236,19 +246,23 @@ $lang->action->dynamicAction->story['unlinkedfromrelease'] = '发布移除需求
$lang->action->dynamicAction->story['linked2build'] = '需求关联版本';
$lang->action->dynamicAction->story['unlinkedfrombuild'] = '版本移除需求';
$lang->action->dynamicAction->story['unlinkedfromproject'] = '移除项目';
$lang->action->dynamicAction->story['undeleted'] = '还原需求';
$lang->action->dynamicAction->story['hidden'] = '隐藏需求';
$lang->action->dynamicAction->project['opened'] = '创建项目';
$lang->action->dynamicAction->project['undeleted'] = '删除项目';
$lang->action->dynamicAction->project['edited'] = '编辑项目';
$lang->action->dynamicAction->project['deleted'] = '删除项目';
$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->project['undeleted'] = '还原项目';
$lang->action->dynamicAction->project['hidden'] = '隐藏项目';
$lang->action->dynamicAction->task['opened'] = '创建任务';
$lang->action->dynamicAction->task['edited'] = '编辑任务';
$lang->action->dynamicAction->task['commented'] = '任务备注';
$lang->action->dynamicAction->task['assigned'] = '任务指派';
$lang->action->dynamicAction->task['confirmed'] = '任务确认';
$lang->action->dynamicAction->task['started'] = '开始任务';
@@ -265,31 +279,35 @@ $lang->action->dynamicAction->task['linkparenttask'] = '关联父任务';
$lang->action->dynamicAction->task['linkchildtask'] = '关联子任务';
$lang->action->dynamicAction->task['recordestimate'] = '记录日志';
$lang->action->dynamicAction->task['moved'] = '移动任务';
$lang->action->dynamicAction->task['undeleted'] = '还原任务';
$lang->action->dynamicAction->task['hidden'] = '隐藏任务';
$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['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['activated'] = '激活Bug';
$lang->action->dynamicAction->bug['assigned'] = '激活Bug';
$lang->action->dynamicAction->bug['tostory'] = '转需求';
$lang->action->dynamicAction->bug['closed'] = '关闭bug';
$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['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->bug['undeleted'] = '还原Bug';
$lang->action->dynamicAction->bug['hidden'] = '隐藏Bug';
$lang->action->dynamicAction->testtask['opened'] = '创建用例';
$lang->action->dynamicAction->testtask['edited'] = '编辑用例';
$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'] = '记录评审结果';
@@ -306,11 +324,13 @@ $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['login'] = '用户登录';
$lang->action->dynamicAction->user['logout'] = '用户退出';
$lang->action->dynamicAction->user['loginxuanxuan'] = '登录喧喧';
$lang->action->dynamicAction->user['undeleted'] = '还原用户';
$lang->action->dynamicAction->user['hidden'] = '隐藏账户';
$lang->action->dynamicAction->entry['created'] = '添加应用';
$lang->action->dynamicAction->entry['edited'] = '编辑应用';
module/group/js/manageview.js
+7
View File
@@ -47,4 +47,11 @@ $(function()
$('#' + id + 'ActionBox').closest('tr').find('td :checkbox').prop('checked', $(this).prop("checked"));
}
})
$('.pl-0px .table-form tbody > tr > td').each(function()
{
$(this).find('.action-item :checkbox').each(function()
{
})
})
})
module/group/view/manageview.html.php
+3 -3
View File
@@ -14,7 +14,7 @@
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2 title='<?php echo $group->name;?>'>
<span class='label-id'><?php echo $group->id;?></span>
<span id='groupName'><i class='icon-lock'> <?php echo $group->name;?></i></span>
<small> <?php echo $lang->arrow . $lang->group->manageView;?></small>
</h2>
</div>
@@ -88,7 +88,7 @@
<?php foreach($lang->action->dynamicAction->$module as $action => $actionTitle):?>
<div class='action-item'>
<div class='checkbox-primary'>
<input type='checkbox' id='<?php echo "$module-$action";?>' name='actions[actions][<?php echo $module;?>][<?php echo $action;?>]' value='<?php echo $action;?>' <?php if(isset($group->acl['actions'][$module][$action]) or empty($group->acl['actions'])) echo "checked";?> />
<input type='checkbox' id='<?php echo "$module-$action";?>' name='actions[actions][<?php echo $module;?>][<?php echo $action;?>]' value='<?php echo $action;?>' <?php if(isset($group->acl['actions'][$module][$action]) or !isset($group->acl['actions'])) echo "checked";?> />
<label class='priv' for='<?php echo "$module-$action";?>'><?php echo $actionTitle;?></label>
</div>
</div>
@@ -102,7 +102,7 @@
<?php foreach($lang->action->dynamicAction->$subModule as $action => $actionTitle):?>
<div class='action-item'>
<div class='checkbox-primary'>
<input type='checkbox' id='<?php echo "$subModule-$action";?>' name='actions[actions][<?php echo $subModule;?>][<?php echo $action;?>]' value='<?php echo $action;?>' <?php if(isset($group->acl['actions'][$subModule][$action]) or empty($group->acl['actions'])) echo "checked";?> />
<input type='checkbox' id='<?php echo "$subModule-$action";?>' name='actions[actions][<?php echo $subModule;?>][<?php echo $action;?>]' value='<?php echo $action;?>' <?php if(isset($group->acl['actions'][$subModule][$action]) or !isset($group->acl['actions'])) echo "checked";?> />
<label class='priv' for='<?php echo "$subModule-$action";?>'><?php echo $actionTitle;?></label>
</div>
</div>