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

* Fix bug #15004.

Browse Source
This commit is contained in:
liyuchun
2021-09-08 15:52:00 +08:00
parent 0721ef1513
commit 21b5e77382
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+11 -11
View File
@@ -285,18 +285,18 @@ $lang->action->dynamicAction->todo['assigned'] = 'Assign Todo';
$lang->action->dynamicAction->todo['undeleted'] = 'Restore Todo';
$lang->action->dynamicAction->todo['hidden'] = 'Hide Todo';
$lang->action->dynamicAction->program['create'] = 'Create Program';
$lang->action->dynamicAction->program['edit'] = 'Edit Program';
$lang->action->dynamicAction->program['activate'] = 'Activate Program';
$lang->action->dynamicAction->program['delete'] = 'Delete Program';
$lang->action->dynamicAction->program['close'] = 'Close Program';
$lang->action->dynamicAction->program['opened'] = 'Create Program';
$lang->action->dynamicAction->program['edited'] = 'Edit Program';
$lang->action->dynamicAction->program['activated'] = 'Activate Program';
$lang->action->dynamicAction->program['deleted'] = 'Delete Program';
$lang->action->dynamicAction->program['closed'] = 'Close Program';
$lang->action->dynamicAction->project['create'] = 'Create Project';
$lang->action->dynamicAction->project['edit'] = 'Edit Project';
$lang->action->dynamicAction->project['start'] = 'Start Project';
$lang->action->dynamicAction->project['suspend'] = 'Suspend Project';
$lang->action->dynamicAction->project['activate'] = 'Activate Project';
$lang->action->dynamicAction->project['close'] = 'Close Project';
$lang->action->dynamicAction->project['opened'] = 'Create Project';
$lang->action->dynamicAction->project['edited'] = 'Edit Project';
$lang->action->dynamicAction->project['started'] = 'Start Project';
$lang->action->dynamicAction->project['suspended'] = 'Suspend Project';
$lang->action->dynamicAction->project['activated'] = 'Activate Project';
$lang->action->dynamicAction->project['closed'] = 'Close Project';
$lang->action->dynamicAction->product['opened'] = 'Create ' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = 'Edit ' . $lang->productCommon;
module/action/lang/zh-cn.php
+11 -11
View File
@@ -285,18 +285,18 @@ $lang->action->dynamicAction->todo['assigned'] = '指派待办';
$lang->action->dynamicAction->todo['undeleted'] = '还原待办';
$lang->action->dynamicAction->todo['hidden'] = '隐藏待办';
$lang->action->dynamicAction->program['create'] = '创建项目集';
$lang->action->dynamicAction->program['edit'] = '编辑项目集';
$lang->action->dynamicAction->program['activate'] = '激活项目集';
$lang->action->dynamicAction->program['delete'] = '删除项目集';
$lang->action->dynamicAction->program['close'] = '关闭项目集';
$lang->action->dynamicAction->program['opened'] = '创建项目集';
$lang->action->dynamicAction->program['edited'] = '编辑项目集';
$lang->action->dynamicAction->program['activated'] = '激活项目集';
$lang->action->dynamicAction->program['deleted'] = '删除项目集';
$lang->action->dynamicAction->program['closed'] = '关闭项目集';
$lang->action->dynamicAction->project['create'] = '创建项目';
$lang->action->dynamicAction->project['edit'] = '编辑项目';
$lang->action->dynamicAction->project['start'] = '开始项目';
$lang->action->dynamicAction->project['suspend'] = '延期项目';
$lang->action->dynamicAction->project['activate'] = '激活项目';
$lang->action->dynamicAction->project['close'] = '关闭项目';
$lang->action->dynamicAction->project['opened'] = '创建项目';
$lang->action->dynamicAction->project['edited'] = '编辑项目';
$lang->action->dynamicAction->project['started'] = '开始项目';
$lang->action->dynamicAction->project['suspended'] = '延期项目';
$lang->action->dynamicAction->project['activated'] = '激活项目';
$lang->action->dynamicAction->project['closed'] = '关闭项目';
$lang->action->dynamicAction->product['opened'] = '创建' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = '编辑' . $lang->productCommon;
module/action/model.php
+2 -1
View File
@@ -826,7 +826,8 @@ class actionModel extends model
$actionCondition = '';
if(isset($this->app->user->rights['acls']['actions']))
{
if(empty($this->app->user->rights['acls']['actions'])) return '';
if(empty($this->app->user->rights['acls']['actions'])) return "`objectType` = 'user' and `action` in ('login','logout')";
foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
{
$actionCondition .= "(`objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";