| systemMode == 'new')) ? $lang->execution->execDesc : $lang->execution->desc;?> |
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 68d7a52f2e..edad5856cc 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -463,7 +463,7 @@
{
var $item = $(this);
var isDivider = $item.hasClass('divider');
- var height = isDivider ? 17 : 40;
+ var height = isDivider ? 17 : $item.outerHeight();
currentHeight += height;
if(currentHeight > maxHeight)
{
diff --git a/module/my/model.php b/module/my/model.php
index c491dfc7f4..52124c0429 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -57,16 +57,155 @@ class myModel extends model
}
}
- public function myInfo()
+ /**
+ * Get my info.
+ *
+ * @access public
+ * @return object
+ */
+ public function getInfo()
{
- $data = array();
+ $info = new stdclass();
+ $info->profile = $this->loadModel('user')->getById($this->app->user->account);
- /* My count. */
- $data['tasks'] = (int) $this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count');
- $data['stories'] = (int) $this->dao->select('count(*) AS count')->from(TABLE_STORY)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->andWhere('type')->eq('story')->fetch('count');
- $data['bugs'] = (int) $this->dao->select('count(*) AS count')->from(TABLE_BUG)->where('assignedTo')->eq($this->app->user->account)->andWhere('deleted')->eq(0)->fetch('count');
+ /* My tasks. */
+ $info->task = new stdclass();
+ $info->task->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_TASK)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count');
+ $info->task->dynamic = array();
- /* Charge products. */
+ if(common::hasPriv('task', 'view'))
+ {
+ $tasks = $this->dao->select('*')->from(TABLE_TASK)
+ ->where('assignedTo')->eq($this->app->user->account)
+ ->andWhere('deleted')->eq('0')
+ ->andWhere('status')->ne('closed')
+ ->orderBy('id_desc')
+ ->limit(3)
+ ->fetchAll();
+ $info->task->dynamic = $tasks;
+ }
+
+ /* My stories. */
+ $info->story = new stdclass();
+ $info->story->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_STORY)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->andWhere('type')->eq('story')->fetch('count');
+ $info->story->dynamic = array();
+ if(common::hasPriv('story', 'view'))
+ {
+ $stories = $this->dao->select('*')->from(TABLE_STORY)
+ ->where('assignedTo')->eq($this->app->user->account)
+ ->andWhere('deleted')->eq('0')
+ ->andWhere('status')->ne('closed')
+ ->orderBy('id_desc')
+ ->limit(3)
+ ->fetchAll();
+ $info->story->dynamic = $stories;
+ }
+
+ /* My bugs. */
+ $info->bug = new stdclass();
+ $info->bug->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_BUG)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count');
+ $info->bug->dynamic = array();
+ if(common::hasPriv('bug', 'view'))
+ {
+ $this->app->loadLang('bug');
+ $bugs = $this->dao->select('*')->from(TABLE_BUG)
+ ->where('assignedTo')->eq($this->app->user->account)
+ ->andWhere('deleted')->eq('0')
+ ->andWhere('status')->ne('closed')
+ ->orderBy('id_desc')
+ ->limit(3)
+ ->fetchAll();
+ $info->bug->dynamic = $bugs;
+ }
+
+ /* My todos. */
+ $info->todo = new stdclass();
+ $info->todo->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_TODO)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count');
+ $info->todo->dynamic = new stdclass();
+ if(common::hasPriv('todo', 'view'))
+ {
+ $todos = $this->dao->select('*')->from(TABLE_TODO)
+ ->where('assignedTo')->eq($this->app->user->account)
+ ->andWhere('cycle')->eq(0)
+ ->andWhere('deleted')->eq(0)
+ ->andWhere('status')->eq('wait')
+ ->orderBy('`date` desc')
+ ->limit(3)
+ ->fetchAll();
+ foreach($todos as $key => $todo)
+ {
+ if($todo->status == 'done' and $todo->finishedBy == $this->app->user->account)
+ {
+ unset($todos[$key]);
+ continue;
+ }
+
+ $todo->begin = date::formatTime($todo->begin);
+ $todo->end = date::formatTime($todo->end);
+ }
+ $info->todo->dynamic = $todos;
+ }
+
+ /* My risks. */
+ $info->risk = new stdclass();
+ $info->risk->total = 0;
+ $info->risk->dynamic = new stdclass();
+ if(common::hasPriv('risk', 'view') and isset($this->config->maxVersion))
+ {
+ $risks = $this->dao->select('*')->from(TABLE_RISK)
+ ->where('assignedTo')->eq($this->app->user->account)
+ ->andWhere('deleted')->eq('0')
+ ->andWhere('status')->ne('closed')
+ ->orderBy('id_desc')
+ ->limit(3)
+ ->fetchAll();
+ $info->risk->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_RISK)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count');
+ $info->risk->dynamic = $risks;
+ }
+
+ /* My meetings. */
+ $info->meeting = new stdclass();
+ $info->meeting->total = 0;
+ $info->meeting->dynamic = new stdclass();
+ if(common::hasPriv('meeting', 'view') and isset($this->config->maxVersion))
+ {
+ $today = helper::today();
+ $now = date('H:i:s', strtotime(helper::now()));
+
+ $meetings = $this->dao->select('*')->from(TABLE_MEETING)
+ ->Where('deleted')->eq('0')
+ ->andWhere('(date')->gt($today)
+ ->orWhere('(begin')->gt($now)
+ ->andWhere('date')->eq($today)
+ ->markRight(2)
+ ->andwhere('(host')->eq($this->app->user->account)
+ ->orWhere('participant')->in($this->app->user->account)
+ ->markRight(1)
+ ->orderBy('id_desc')
+ ->limit(3)
+ ->fetchAll();
+ $info->meeting->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_MEETING)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count');
+ $info->meeting->dynamic = $meetings;
+ }
+
+ /* My issues. */
+ $info->issue = new stdclass();
+ $info->issue->total = 0;
+ $info->issue->dynamic = new stdclass();
+ if(common::hasPriv('issue', 'view') and isset($this->config->maxVersion))
+ {
+ $issues = $this->dao->select('*')->from(TABLE_ISSUE)
+ ->where('assignedTo')->eq($this->app->user->account)
+ ->andWhere('deleted')->eq('0')
+ ->andWhere('status')->ne('closed')
+ ->orderBy('id_desc')
+ ->limit(3)
+ ->fetchAll();
+ $info->issue->total = (int) $this->dao->select('count(*) AS count')->from(TABLE_ISSUE)->where('assignedTo')->eq($this->app->user->account)->andWhere('status')->ne('closed')->andWhere('deleted')->eq(0)->fetch('count');
+ $info->issue->dynamic = $issues;
+ }
+
+ /* My charged products. */
$products = $this->dao->select('t1.id as id,t1.*')->from(TABLE_PRODUCT)->alias('t1')
->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
->where('t1.deleted')->eq(0)
@@ -76,6 +215,7 @@ class myModel extends model
->orderBy('t1.order_asc')
->fetchAll('id');
$productKeys = array_keys($products);
+
$stories = $this->dao->select('product, status, count(status) AS count')
->from(TABLE_STORY)
->where('deleted')->eq(0)
@@ -107,6 +247,7 @@ class myModel extends model
$execution = $this->loadModel('execution')->getById($execuData->id);
$executions[$key]->progress = ($execution->totalConsumed + $execution->totalLeft) ? floor($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft) * 1000) / 1000 * 100 : 0;
}
+
foreach($products as $key => $product)
{
$product->plans = isset($plans[$product->id]) ? $plans[$product->id] : 0;
@@ -114,7 +255,7 @@ class myModel extends model
if(isset($stories[$product->id])) $product->stories = $stories[$product->id];
if(isset($executions[$product->id])) $product->executions = $executions[$product->id];
}
- $data['chargeProducts'] = array_values($products);
+ $info->products = array_values($products);
/* All projects. */
$projects = $this->loadModel('project')->getOverviewList('byStatus', 'all', 'order_asc');
@@ -126,119 +267,7 @@ class myModel extends model
$projects[$key]->progress = ($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0;
}
}
- $data['projects'] = array_values($projects);
-
- /* Todo list. */
- if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true;
- if(common::hasPriv('task', 'view')) $hasViewPriv['task'] = true;
- if(common::hasPriv('bug', 'view')) $hasViewPriv['bug'] = true;
- if(common::hasPriv('risk', 'view') and isset($this->config->maxVersion)) $hasViewPriv['risk'] = true;
- if(common::hasPriv('issue', 'view') and isset($this->config->maxVersion)) $hasViewPriv['issue'] = true;
- if(common::hasPriv('meeting', 'view') and isset($this->config->maxVersion)) $hasViewPriv['meeting'] = true;
- if(common::hasPriv('story', 'view')) $hasViewPriv['story'] = true;
- if(isset($hasViewPriv['todo']))
- {
- $this->app->loadClass('date');
- $this->app->loadLang('todo');
- $stmt = $this->dao->select('*')->from(TABLE_TODO)
- ->where('assignedTo')->eq($this->app->user->account)
- ->andWhere('cycle')->eq(0)
- ->andWhere('deleted')->eq(0)
- ->andWhere('status')->eq('wait')
- ->orderBy('`date` desc')
- ->limit(3);
- $todos = $stmt->fetchAll();
- foreach($todos as $key => $todo)
- {
- if($todo->status == 'done' and $todo->finishedBy == $this->app->user->account)
- {
- unset($todos[$key]);
- continue;
- }
-
- $todo->begin = date::formatTime($todo->begin);
- $todo->end = date::formatTime($todo->end);
- }
- $data['todos'] = $todos;
- }
- if(isset($hasViewPriv['task']))
- {
- $this->app->loadLang('task');
- $this->app->loadLang('execution');
- $stmt = $this->dao->select('*')->from(TABLE_TASK)
- ->where('assignedTo')->eq($this->app->user->account)
- ->andWhere('deleted')->eq('0')
- ->andWhere('status')->ne('closed')
- ->orderBy('id_desc')
- ->limit(3);
- $data['toTasks'] = $stmt->fetchAll();
- }
- if(isset($hasViewPriv['bug']))
- {
- $this->app->loadLang('bug');
- $stmt = $this->dao->select('*')->from(TABLE_BUG)
- ->where('assignedTo')->eq($this->app->user->account)
- ->andWhere('deleted')->eq('0')
- ->andWhere('status')->ne('closed')
- ->orderBy('id_desc')
- ->limit(3);
- $data['toBugs'] = $stmt->fetchAll();
- }
- if(isset($hasViewPriv['risk']))
- {
- $this->app->loadLang('risk');
- $stmt = $this->dao->select('*')->from(TABLE_RISK)
- ->where('assignedTo')->eq($this->app->user->account)
- ->andWhere('deleted')->eq('0')
- ->andWhere('status')->ne('closed')
- ->orderBy('id_desc')
- ->limit(3);
- $data['toRisks'] = $stmt->fetchAll();
- }
- if(isset($hasViewPriv['meeting']))
- {
- $this->app->loadLang('meeting');
- $today = helper::today();
- $now = date('H:i:s', strtotime(helper::now()));
-
- $meetings = $this->dao->select('*')->from(TABLE_MEETING)
- ->Where('deleted')->eq('0')
- ->andWhere('(date')->gt($today)
- ->orWhere('(begin')->gt($now)
- ->andWhere('date')->eq($today)
- ->markRight(2)
- ->andwhere('(host')->eq($this->app->user->account)
- ->orWhere('participant')->in($this->app->user->account)
- ->markRight(1)
- ->orderBy('id_desc')
- ->limit(3)
- ->fetchAll();
-
- $data['toMeetings'] = $meetings;
- }
- if(isset($hasViewPriv['issue']))
- {
- $this->app->loadLang('issue');
- $stmt = $this->dao->select('*')->from(TABLE_ISSUE)
- ->where('assignedTo')->eq($this->app->user->account)
- ->andWhere('deleted')->eq('0')
- ->andWhere('status')->ne('closed')
- ->orderBy('id_desc')
- ->limit(3);
-
- $data['toIssues'] = $stmt->fetchAll();
- }
- if(isset($hasViewPriv['story']))
- {
- $this->app->loadLang('story');
- $stmt = $this->dao->select('*')->from(TABLE_STORY)
- ->where('assignedTo')->eq($this->app->user->account)
- ->andWhere('deleted')->eq('0')
- ->andWhere('status')->ne('closed')
- ->orderBy('id_desc')
- ->limit(3);
- $data['toStories'] = $stmt->fetchAll();
- }
+ $info->projects = array_values($projects);
/* Dynamic. */
$actions = $this->loadModel('action')->getDynamic('all', 'today', 'date_desc');
@@ -247,19 +276,13 @@ class myModel extends model
{
$actions[$key]->actor = $users[$action->actor];
}
- $data['dynamic'] = $actions;
+ $info->dynamic = $actions;
/* User info. */
- global $lang, $app;
- $data['user'] = new stdclass();
- $data['user']->score = $app->user->score;
- $data['user']->avatar = !empty($app->user->avatar) ? $app->user->avatar : strtoupper($app->user->account[0]);
- $data['user']->role = isset($lang->user->roleList[$app->user->role]) ? $lang->user->roleList[$app->user->role] : $app->user->role;
- $data['user']->email = $app->user->email;
- $data['participateProjectCount'] = count($data['projects']);
- $data['createdDocs'] = $this->dao->select('count(*) AS count')->from(TABLE_DOC)->where('addedBy')->eq($this->app->user->account)->andWhere('deleted')->eq('0')->fetch('count');
+ $info->participateProjectCount = count($info->projects);
+ $info->createdDocs = $this->dao->select('count(*) AS count')->from(TABLE_DOC)->where('addedBy')->eq($this->app->user->account)->andWhere('deleted')->eq('0')->fetch('count');
- return $data;
+ return $info;
}
}
diff --git a/module/personnel/control.php b/module/personnel/control.php
index 43835db04c..fc3b80d5fa 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -145,6 +145,7 @@ class personnel extends control
*
* @param int $objectID
* @param int $deptID
+ * @param int $copyID
* @param string $objectType program|project|product|sprint
* @param string $module
* @param int $programID
@@ -152,7 +153,7 @@ class personnel extends control
* @access public
* @return void
*/
- public function addWhitelist($objectID = 0, $deptID = 0, $objectType = 'program', $module = 'personnel', $programID = 0, $from = '')
+ public function addWhitelist($objectID = 0, $deptID = 0, $copyID = 0, $objectType = 'program', $module = 'personnel', $programID = 0, $from = '')
{
if($this->app->openApp == 'program')
{
@@ -180,20 +181,38 @@ class personnel extends control
$this->loadModel('dept');
$deptUsers = empty($deptID) ? array() : $this->dept->getDeptUserPairs($deptID);
+ $copyObjectType = $objectType;
+ if($copyObjectType == 'sprint')
+ {
+ $object = $this->loadModel('project')->getByID($copyID);
+ if(!empty($object)) $copyObjectType = 'project';
+ }
+ $copyUsers = empty($copyID) ? array() : $this->personnel->getWhitelistAccount($copyID, $copyObjectType);
+ $appendUsers = array_unique($deptUsers + $copyUsers);
+
+ $objectName = $this->lang->projectCommon . $this->lang->execution->or . $this->lang->execution->common;
+ if($objectType == 'program') $objectName = $this->lang->program->common;
+ if($objectType == 'product') $objectName = $this->lang->productCommon;
+ if($objectType == 'project') $objectName = $this->lang->projectCommon;
+ $this->lang->personnel->selectObjectTips = sprintf($this->lang->personnel->selectObjectTips, $objectName);
+
$this->view->title = $this->lang->personnel->addWhitelist;
$this->view->position[] = $this->lang->personnel->addWhitelist;
- $this->view->objectID = $objectID;
- $this->view->objectType = $objectType;
- $this->view->module = $module;
- $this->view->deptID = $deptID;
- $this->view->deptUsers = $deptUsers;
- $this->view->whitelist = $this->personnel->getWhitelist($objectID, $objectType);
- $this->view->depts = $this->dept->getOptionMenu();
- $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
- $this->view->dept = $this->dept->getByID($deptID);
- $this->view->programID = $programID;
- $this->view->from = $from;
+ $this->view->objectID = $objectID;
+ $this->view->objectType = $objectType;
+ $this->view->objectName = $objectName;
+ $this->view->objects = array('' => '') + $this->personnel->getCopyObjects($objectID, $objectType);
+ $this->view->module = $module;
+ $this->view->deptID = $deptID;
+ $this->view->appendUsers = $appendUsers;
+ $this->view->whitelist = $this->personnel->getWhitelist($objectID, $objectType);
+ $this->view->depts = $this->dept->getOptionMenu();
+ $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
+ $this->view->dept = $this->dept->getByID($deptID);
+ $this->view->programID = $programID;
+ $this->view->from = $from;
+ $this->view->copyID = $copyID;
$this->display();
}
diff --git a/module/personnel/js/addwhitelist.js b/module/personnel/js/addwhitelist.js
index eb81369c64..083645bb30 100644
--- a/module/personnel/js/addwhitelist.js
+++ b/module/personnel/js/addwhitelist.js
@@ -1,15 +1,16 @@
/**
- * Users by department.
+ * Users by dept,execution,project,product or program.
*
- * @param object dept
+ * @param object $object
+ * @access public
* @return void
*/
-function setDeptUsers(dept)
+function setObjectUsers()
{
- var deptID = $(dept).val();
- var link = createLink(module, moduleMethod, 'objectID=' + objectID + '&deptID=' + deptID + '&objectType=' + objectType + '&module=' + module);
-
- if(module == 'program') link = createLink(module, moduleMethod, 'objectID=' + objectID + '&deptID=' + deptID + '&programID=' + programID + '&from=' + from);
+ var copyID = $('#object').val();
+ var deptID = $('#dept').val();
+ var link = createLink(module, moduleMethod, 'objectID=' + objectID + '&deptID=' + deptID + '©ID=' + copyID + '&objectType=' + objectType + '&module=' + module);
+ if(module == 'program') link = createLink(module, moduleMethod, 'objectID=' + objectID + '&deptID=' + deptID + '©ID=' + copyID + '&programID=' + programID + '&from=' + from);
location.href = link;
}
diff --git a/module/personnel/lang/de.php b/module/personnel/lang/de.php
index 3390cdb972..fab6b23d11 100644
--- a/module/personnel/lang/de.php
+++ b/module/personnel/lang/de.php
@@ -30,9 +30,11 @@ $lang->personnel->resolved = 'Resolved';
$lang->personnel->UR = $lang->URCommon;
$lang->personnel->SR = $lang->SRCommon;
-$lang->personnel->whitelist = 'Whitelist';
-$lang->personnel->addWhitelist = 'Add Whitelist';
+$lang->personnel->whitelist = 'Whitelist';
+$lang->personnel->addWhitelist = 'Add Whitelist';
$lang->personnel->unbindWhitelist = 'Remove Whitelist';
-$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->copy = 'Copy Whitelist';
-$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->selectObjectTips = 'Select %s to copy its whitelist';
diff --git a/module/personnel/lang/en.php b/module/personnel/lang/en.php
index ea35916e8b..3f78c567f9 100644
--- a/module/personnel/lang/en.php
+++ b/module/personnel/lang/en.php
@@ -30,9 +30,11 @@ $lang->personnel->resolved = 'Resolved';
$lang->personnel->UR = $lang->URCommon;
$lang->personnel->SR = $lang->SRCommon;
-$lang->personnel->whitelist = 'Whitelist';
-$lang->personnel->addWhitelist = 'Add Whitelist';
+$lang->personnel->whitelist = 'Whitelist';
+$lang->personnel->addWhitelist = 'Add Whitelist';
$lang->personnel->unbindWhitelist = 'Remove Whitelist';
-$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->copy = 'Copy Whitelist';
-$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->selectObjectTips = 'Select %s to copy its whitelist';
diff --git a/module/personnel/lang/fr.php b/module/personnel/lang/fr.php
index 3390cdb972..fab6b23d11 100644
--- a/module/personnel/lang/fr.php
+++ b/module/personnel/lang/fr.php
@@ -30,9 +30,11 @@ $lang->personnel->resolved = 'Resolved';
$lang->personnel->UR = $lang->URCommon;
$lang->personnel->SR = $lang->SRCommon;
-$lang->personnel->whitelist = 'Whitelist';
-$lang->personnel->addWhitelist = 'Add Whitelist';
+$lang->personnel->whitelist = 'Whitelist';
+$lang->personnel->addWhitelist = 'Add Whitelist';
$lang->personnel->unbindWhitelist = 'Remove Whitelist';
-$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->copy = 'Copy Whitelist';
-$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->selectObjectTips = 'Select %s to copy its whitelist';
diff --git a/module/personnel/lang/vi.php b/module/personnel/lang/vi.php
index 3390cdb972..fab6b23d11 100644
--- a/module/personnel/lang/vi.php
+++ b/module/personnel/lang/vi.php
@@ -30,9 +30,11 @@ $lang->personnel->resolved = 'Resolved';
$lang->personnel->UR = $lang->URCommon;
$lang->personnel->SR = $lang->SRCommon;
-$lang->personnel->whitelist = 'Whitelist';
-$lang->personnel->addWhitelist = 'Add Whitelist';
+$lang->personnel->whitelist = 'Whitelist';
+$lang->personnel->addWhitelist = 'Add Whitelist';
$lang->personnel->unbindWhitelist = 'Remove Whitelist';
-$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?';
+$lang->personnel->copy = 'Copy Whitelist';
-$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.';
+$lang->personnel->selectObjectTips = 'Select %s to copy its whitelist';
diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php
index a262e8fb5d..d5b345f623 100644
--- a/module/personnel/lang/zh-cn.php
+++ b/module/personnel/lang/zh-cn.php
@@ -30,9 +30,11 @@ $lang->personnel->resolved = '解决';
$lang->personnel->UR = $lang->URCommon;
$lang->personnel->SR = $lang->SRCommon;
-$lang->personnel->whitelist = '白名单列表';
-$lang->personnel->addWhitelist = '添加白名单';
+$lang->personnel->whitelist = '白名单列表';
+$lang->personnel->addWhitelist = '添加白名单';
$lang->personnel->unbindWhitelist = '删除白名单';
-$lang->personnel->confirmDelete = '确认将该用户移除白名单？';
+$lang->personnel->confirmDelete = '确认将该用户移除白名单？';
+$lang->personnel->copy = '复制白名单';
-$lang->personnel->openedPGMTip = '该项目集是公开状态，有项目集视图权限的人员即可访问。';
+$lang->personnel->openedPGMTip = '该项目集是公开状态，有项目集视图权限的人员即可访问。';
+$lang->personnel->selectObjectTips = '请选择一个%s白名单来复制';
diff --git a/module/personnel/model.php b/module/personnel/model.php
index d6cd126d74..35008cf8ec 100644
--- a/module/personnel/model.php
+++ b/module/personnel/model.php
@@ -456,6 +456,58 @@ class personnelModel extends model
->fetchGroup('root', 'id');
}
+ /**
+ * Get objects to copy whitelist.
+ *
+ * @param int $objectID
+ * @param int $objectType
+ * @access public
+ * @return array
+ */
+ public function getCopyObjects($objectID, $objectType)
+ {
+ $objects = array();
+
+ if($objectType == 'sprint')
+ {
+ $parentID = 0;
+ if($this->config->systemMode == 'new') $parentID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($objectID)->fetch('project');
+
+ $objects = $this->dao->select('id,name')->from(TABLE_EXECUTION)
+ ->where('(project')->eq($parentID)
+ ->orWhere('id')->eq($parentID)
+ ->markRight(1)
+ ->andWhere('(id')->in($this->app->user->view->projects)
+ ->orWhere('id')->in($this->app->user->view->sprints)
+ ->markRight(1)
+ ->andWhere('deleted')->eq(0)
+ ->orderBy('type')
+ ->fetchPairs();
+ foreach($objects as $id => &$object)
+ {
+ if($id == $parentID) $object = $this->lang->projectCommon . '-' . $object;
+ if($id != $parentID) $object = $this->lang->execution->common . '-' . $object;
+ }
+ }
+ elseif($objectType == 'project')
+ {
+ $parentID = $this->dao->select('parent')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch('parent');
+ $objects = $this->loadModel('project')->getPairsByProgram($parentID);
+ }
+ elseif($objectType == 'product')
+ {
+ $parentID = $this->dao->select('program')->from(TABLE_PRODUCT)->where('id')->eq($objectID)->fetch('program');
+ $objects = $this->loadModel('product')->getPairs('', $parentID);
+ }
+ elseif($objectType == 'program')
+ {
+ $objects = $this->loadModel('program')->getPairs();
+ }
+
+ unset($objects[$objectID]);
+ return $objects;
+ }
+
/**
* Access to program set invest staff.
*
diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php
index ffc351f2cb..d9d07bdfc6 100644
--- a/module/personnel/view/addwhitelist.html.php
+++ b/module/personnel/view/addwhitelist.html.php
@@ -13,18 +13,23 @@
+
-
- personnel->addWhitelist;?>
-
|