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

* Modify whitelist related logic.

Browse Source
This commit is contained in:
leiyong
2020-10-27 13:10:54 +08:00
parent 27986da851
commit 5002be3199
23 changed files with 122 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/config.php
+1 -1
View File
@@ -126,5 +126,5 @@ $config->program->datatable->fieldList['PRJSurplus']['sort'] = 'no';
$config->program->datatable->fieldList['actions']['title'] = 'actions';
$config->program->datatable->fieldList['actions']['fixed'] = 'right';
$config->program->datatable->fieldList['actions']['width'] = '220';
$config->program->datatable->fieldList['actions']['width'] = '240';
$config->program->datatable->fieldList['actions']['required'] = 'yes';
module/program/control.php
+47
View File
@@ -1341,4 +1341,51 @@ class program extends control
$this->dao->update(TABLE_PROJECT)->set('`order`')->eq($order)->where('id')->eq($newID)->exec();
}
}
/**
* Get white list personnel.
*
* @param int $projectID
* @param int $programID
* @param string $module
* @param string $objectType
* @param string $orderby
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
public function PRJWhitelist($projectID = 0, $programID = 0, $module='program', $objectType = 'project', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->lang->navGroup->program = 'project';
echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
}
/**
* Adding users to the white list.
*
* @param int $projectID
* @param int $deptID
* @access public
* @return void
*/
public function PRJAddWhitelist($projectID = 0, $deptID = 0)
{
$this->lang->navGroup->program = 'project';
echo $this->fetch('personnel', 'addWhitelist', "objectID=$projectID&dept=$deptID&objectType=project&module=program");
}
/*
* Removing users from the white list.
*
* @param int $id
* @param string $confirm
* @access public
* @return void
*/
public function unbindWhielist($id = 0, $confirm = 'no')
{
echo $this->fetch('personnel', 'unbindWhielist', "id=$id&confirm=$confirm");
}
}
module/program/lang/de.php
+1
View File
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting = 'Program Settings';
$lang->program->PRJModuleOpen = 'Program Name';
$lang->program->PRJUpdateOrder = 'Order';
$lang->program->PRJSort = 'Order';
$lang->program->PRJWhitelist = 'Project Whitelist';
/* Fields. */
$lang->program->common = 'Project';
module/program/lang/en.php
+1
View File
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting = 'Program Settings';
$lang->program->PRJModuleOpen = 'Program Name';
$lang->program->PRJUpdateOrder = 'Order';
$lang->program->PRJSort = 'Order';
$lang->program->PRJWhitelist = 'Project Whitelist';
/* Fields. */
$lang->program->common = 'Project';
module/program/lang/fr.php
+1
View File
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting = 'Program Settings';
$lang->program->PRJModuleOpen = 'Program Name';
$lang->program->PRJUpdateOrder = 'Order';
$lang->program->PRJSort = 'Order';
$lang->program->PRJWhitelist = 'Project Whitelist';
/* Fields. */
$lang->program->common = 'Project';
module/program/lang/vi.php
+1
View File
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting = 'Program Settings';
$lang->program->PRJModuleOpen = 'Program Name';
$lang->program->PRJUpdateOrder = 'Order';
$lang->program->PRJSort = 'Order';
$lang->program->PRJWhitelist = 'Project Whitelist';
/* Fields. */
$lang->program->common = 'Project';
module/program/lang/zh-cn.php
+1
View File
@@ -27,6 +27,7 @@ $lang->program->PRJModuleSetting = '项目集设置';
$lang->program->PRJModuleOpen = '显示项目集名';
$lang->program->PRJUpdateOrder = '排序';
$lang->program->PRJSort = '项目排序';
$lang->program->PRJWhitelist = '项目白名单';
/* Fields. */
$lang->program->common = '项目集';
module/program/lang/zh-tw.php
+9 -8
View File
@@ -27,9 +27,10 @@ $lang->program->PRJModuleSetting = '項目集設置';
$lang->program->PRJModuleOpen = '顯示項目集名';
$lang->program->PRJUpdateOrder = '排序';
$lang->program->PRJSort = '項目排序';
$lang->program->PRJWhitelist = '項目白名單';
/* Fields. */
$lang->program->common = '項目';
$lang->program->common = '項目集';
$lang->program->stage = '階段';
$lang->program->PRJName = '項目名稱';
$lang->program->PRJModel = '管理類型';
@@ -99,9 +100,9 @@ $lang->program->featureBar['closed'] = '已關閉';
$lang->program->PRJAclList['open'] = "公開(有項目視圖權限，即可訪問)";
$lang->program->PRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)";
$lang->program->PGMPRJAclList['open'] = "全部公開（有項目視圖權限，即可訪問）";
$lang->program->PGMPRJAclList['openinside'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
$lang->program->PGMPRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)";
$lang->program->PGMPRJAclList['open'] = "全部公開（有項目視圖權限，即可訪問）";
$lang->program->PGMPRJAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）";
$lang->program->PGMPRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)";
$lang->program->PRJAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
$lang->program->PRJAuthList['reset'] = '重新定義(只取項目權限)';
@@ -177,7 +178,7 @@ $lang->program->PGMActivate = '激活項目集';
$lang->program->PGMExport = '導出';
$lang->program->PGMStakeholder = '干係人列表';
$lang->program->createStakeholder = '添加干係人';
$lang->program->unlinkStakeholder = '删除干係人';
$lang->program->unlinkStakeholder = '刪除干係人';
$lang->program->importStakeholder = '從父項目集導入';
$lang->program->PGMManageMembers = '項目集團隊';
@@ -204,9 +205,9 @@ $lang->program->PGMShowClosed = '顯示已關閉';
$lang->program->PGMAclList['open'] = "公開（有項目集視圖權限，即可訪問）";
$lang->program->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問）";
$lang->program->subPGMAclList['open'] = "全部公開（有項目集視圖權限，即可訪問）";
$lang->program->subPGMAclList['openinside'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
$lang->program->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問）";
$lang->program->subPGMAclList['open'] = "全部公開（有項目集視圖權限，即可訪問）";
$lang->program->subPGMAclList['program'] = "項目集內公開 (所有上級項目集負責人和干係人、本項目集負責人和干係人可訪問）";
$lang->program->subPGMAclList['private'] = "私有（本項目集負責人和干係人可訪問）";
$lang->program->PGMAuthList['extend'] = '繼承(取項目權限與組織權限的並集)';
$lang->program->PGMAuthList['reset'] = '重新定義(只取項目權限)';
module/program/model.php
+2 -1
View File
@@ -1362,8 +1362,9 @@ class programModel extends model
echo "<span class='pie-icon' data-percent='{$project->hours->progress}' data-border-color='#ddd' data-back-color='#f1f1f1'></span> {$project->hours->progress}%";
break;
case 'actions':
common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'group');
common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock');
common::printIcon('program', 'PRJManageMembers', "programID=$project->id", $project, 'list', 'persons');
common::printIcon('program', 'PRJWhitelist', "projectID=$project->id&programID=$programID", $project, 'list', 'group');
common::printIcon('program', 'PRJStart', "programID=$project->id", $project, 'list', 'start', '', 'iframe', true);
common::printIcon('program', 'PRJActivate', "programID=$project->id", $project, 'list', 'magic', '', 'iframe', true);
common::printIcon('program', 'PRJSuspend', "programID=$project->id", $project, 'list', 'pause', '', 'iframe', true);