| group->productList?> |
diff --git a/module/program/control.php b/module/program/control.php
index eefbd95450..0ae6b07ec2 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -478,12 +478,12 @@ class program extends control
$this->view->programID = $programID;
$this->view->program = $this->program->getPGMByID($programID);
- $this->view->users = $this->loadModel('user')->getPairs('nodeleted');
+ $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed');
$this->view->deptUsers = $deptUsers;
$this->view->dept = $dept;
$this->view->depts = array('' => '') + $this->dept->getOptionMenu();
$this->view->stakeholders = $this->program->getStakeholders($programID, 't1.id_desc');
- $this->view->parentStakeholders = $this->program->getStakeholdersByList($parentIdList);
+ $this->view->parentStakeholders = $this->program->getStakeholdersByPGMList($parentIdList);
$this->display();
}
diff --git a/module/program/model.php b/module/program/model.php
index b4314fee92..6ae4d06859 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -454,7 +454,7 @@ class programModel extends model
->where('deleted')->eq('0')
->beginIF($from == 'program')
->andWhere('type')->in('program,project')
- ->andWhere('id')->in($this->app->user->view->programs . $this->app->user->view->projects)
+ ->andWhere('id')->in($this->app->user->view->programs . ',' . $this->app->user->view->projects)
->fi()
->beginIF($from == 'product')
->andWhere('type')->eq('program')
@@ -467,7 +467,7 @@ class programModel extends model
while($program = $stmt->fetch())
{
$link = $from == 'program' ? helper::createLink('program', 'pgmview', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars);
- $linkHtml = html::a($link, " " . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name");
+ $linkHtml = html::a($link, " " . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name");
if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id]))
{
@@ -535,7 +535,7 @@ class programModel extends model
*/
public function getStakeholders($programID = 0, $orderBy, $pager = null)
{
- return $this->dao->select('t2.*, t1.id')->from(TABLE_STAKEHOLDER)->alias('t1')
+ return $this->dao->select('t2.account,t2.realname,t2.role,t2.qq,t2.mobile,t2.phone,t2.weixin,t2.email,t1.id')->from(TABLE_STAKEHOLDER)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.user=t2.account')
->where('t1.objectID')->eq($programID)
->andWhere('t1.objectType')->eq('program')
@@ -552,7 +552,7 @@ class programModel extends model
* @access public
* @return void
*/
- public function getStakeholdersByList($programIdList = 0)
+ public function getStakeholdersByPGMList($programIdList = 0)
{
return $this->dao->select('distinct user as account')->from(TABLE_STAKEHOLDER)
->where('objectID')->in($programIdList)
@@ -589,13 +589,22 @@ class programModel extends model
$this->dao->insert(TABLE_STAKEHOLDER)->data($stakeholder)->exec();
}
- /* Only changed account update userview. */
+ /* If any account changed, update his view. */
$oldAccounts = array_keys($oldJoin);
$changedAccounts = array_diff($accounts, $oldAccounts);
$changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
$changedAccounts = array_unique($changedAccounts);
$this->loadModel('user')->updateUserView($programID, 'program', $changedAccounts);
+
+ /* Update children user view. */
+ $childPgmList = $this->dao->select('id')->from(TABLE_PROJECT)->where('path')->like("%,$programID,%")->andWhere('type')->eq('program')->fetchPairs();
+ $childPRJList = $this->dao->select('id')->from(TABLE_PROJECT)->where('path')->like("%,$programID,%")->andWhere('type')->eq('project')->fetchPairs();
+ $childProducts = $this->dao->select('id')->from(TABLE_PRODUCT)->where('program')->eq($programID)->fetchPairs();
+
+ if(!empty($childPGMList)) $this->user->updateUserView($childPGMList, 'program', $changedAccounts);
+ if(!empty($childPRJList)) $this->user->updateUserView($childPRJList, 'project', $changedAccounts);
+ if(!empty($childProducts)) $this->user->updateUserView($childProducts, 'product', $changedAccounts);
}
/**
@@ -957,6 +966,7 @@ class programModel extends model
->where('type')->in('project,program')
->andWhere('status')->ne('closed')
->andWhere('deleted')->eq('0')
+ ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs . ',' . $this->app->user->view->projects)->fi()
->beginIF($projectID > 0)->andWhere('path')->like($path . '%')->fi()
->orderBy('grade desc, `order`')
->get();
@@ -1037,7 +1047,7 @@ class programModel extends model
public function createPRJManageLink($project)
{
$link = $project->type == 'program' ? helper::createLink('program', 'PRJbrowse', "programID={$project->id}") : helper::createLink('program', 'index', "projectID={$project->id}", '', '', $project->id);
- $icon = $project->type == 'program' ? ' ' : ' ';
+ $icon = $project->type == 'program' ? ' ' : ' ';
return html::a($link, $icon . $project->name, '_self', "id=project{$project->id} title='{$project->name}' class='text-ellipsis'");
}
@@ -1125,18 +1135,6 @@ class programModel extends model
$this->dao->insert(TABLE_USERGROUP)->data($groupPriv)->exec();
}
- /* Init groups. */
- $groups = $this->dao->select('name, `desc`')->from(TABLE_GROUP)
- ->where('PRJ')->eq(0)
- ->andWhere('role')->in('dev,qa,pm,po,others')
- ->fetchAll();
-
- foreach($groups as $group)
- {
- $group->PRJ = $projectID;
- $this->dao->insert(TABLE_GROUP)->data($group)->exec();
- }
-
return $projectID;
}
}
diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php
index f831e5b24d..d7cf5e6eef 100644
--- a/module/program/view/pgmbrowsebylist.html.php
+++ b/module/program/view/pgmbrowsebylist.html.php
@@ -52,9 +52,9 @@
|
type == 'program'):?>
- createLink('program', 'pgmview', "programID=$program->id"), " " . $program->name);?>
+ createLink('program', 'pgmview', "programID=$program->id"), " " . $program->name);?>
- createLink('program', 'index', "programID=$program->id", '', '', $program->id), " " . $program->name);?>
+ createLink('program', 'index', "programID=$program->id", '', '', $program->id), " " . $program->name);?>
|
project->statusList, $program->status, '');?> |
diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php
index a8d9d9bf8a..86bd53b4f3 100644
--- a/module/stakeholder/control.php
+++ b/module/stakeholder/control.php
@@ -90,7 +90,7 @@ class stakeholder extends control
$this->view->position[] = $this->lang->stakeholder->batchCreate;
$this->view->project = $this->loadModel('program')->getPGMByID($this->session->PRJ);
- $this->view->users = $this->user->getPairs('all|nodeleted');
+ $this->view->users = $this->user->getPairs('all|nodeleted|noclosed');
$this->view->deptUsers = $deptUsers;
$this->view->dept = $dept;
$this->view->projectID = $this->session->PRJ;
diff --git a/module/user/model.php b/module/user/model.php
index 7a9de601ca..83f9f8d815 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -864,6 +864,7 @@ class userModel extends model
continue;
}
+ /* Merge acls. */
if(!empty($acl['programs'])) $acls['programs'] = !empty($acls['programs']) ? array_merge($acls['programs'], $acl['programs']) : $acl['programs'];
if(!empty($acl['projects'])) $acls['projects'] = !empty($acls['projects']) ? array_merge($acls['projects'], $acl['projects']) : $acl['projects'];
if(!empty($acl['products'])) $acls['products'] = !empty($acls['products']) ? array_merge($acls['products'], $acl['products']) : $acl['products'];
@@ -878,7 +879,7 @@ class userModel extends model
if($sprintAllow) $acls['sprints'] = array();
if($viewAllow) $acls['views'] = array();
if($actionAllow) unset($acls['actions']);
-
+
$sql = $this->dao->select('module, method')->from(TABLE_GROUP)->alias('t1')
->leftJoin(TABLE_USERGROUP)->alias('t2')->on('t1.id = t2.group')
->leftJoin(TABLE_GROUPPRIV)->alias('t3')->on('t2.group = t3.group')
@@ -1652,21 +1653,21 @@ class userModel extends model
$parentStakeholderGroup = $this->stakeholder->getParentStakeholderGroup($programIdList);
/* Get auth users. */
- $authUsers = array();
- if(!empty($users)) $authUsers = $users;
+ $authedUsers = array();
+ if(!empty($users)) $authedUsers = $users;
if(empty($users))
{
foreach($programs as $program)
{
$stakeholders = zget($stakeholderGroup, $program->id, array());
if($program->acl == 'program') $stakeholders += zget($parentStakeholderGroup, $program->id, array());
- $authUsers += $this->getProgramAuthUsers($program, $stakeholders);
+ $authedUsers += $this->getProgramAuthedUsers($program, $stakeholders);
}
}
/* Get all programs user view. */
- $stmt = $this->dao->select("account,programs")->from(TABLE_USERVIEW)->where('account')->in($authUsers);
- if(empty($users) and $authUsers)
+ $stmt = $this->dao->select("account,programs")->from(TABLE_USERVIEW)->where('account')->in($authedUsers);
+ if(empty($users) and $authedUsers)
{
foreach($programs as $programID => $program) $stmt->orWhere("CONCAT(',', programs, ',')")->like("%,{$programID},%");
}
@@ -1719,8 +1720,8 @@ class userModel extends model
$parentStakeholderGroup = $this->stakeholder->getParentStakeholderGroup($projectIdList);
/* Get auth users. */
- $authUsers = array();
- if(!empty($users)) $authUsers = $users;
+ $authedUsers = array();
+ if(!empty($users)) $authedUsers = $users;
if(empty($users))
{
foreach($projects as $project)
@@ -1729,13 +1730,13 @@ class userModel extends model
$teams = zget($teamGroups, $project->id, array());
if($project->acl == 'program') $stakeholders += zget($parentStakeholderGroup, $project->id, array());
- $authUsers += $this->getProjectAuthUsers($project, $stakeholders, $teams);
+ $authedUsers += $this->getProjectAuthedUsers($project, $stakeholders, $teams);
}
}
/* Get all programs user view. */
- $stmt = $this->dao->select("account,projects")->from(TABLE_USERVIEW)->where('account')->in($authUsers);
- if(empty($users) and $authUsers)
+ $stmt = $this->dao->select("account,projects")->from(TABLE_USERVIEW)->where('account')->in($authedUsers);
+ if(empty($users) and $authedUsers)
{
foreach($projects as $projectID => $project) $stmt->orWhere("CONCAT(',', projects, ',')")->like("%,{$projectID},%");
}
@@ -1856,8 +1857,8 @@ class userModel extends model
$stakeholderGroup = $this->loadModel('stakeholder')->getStakeholderGroup($projectIdList);
/* Get auth users. */
- $authUsers = array();
- if(!empty($users)) $authUsers = $users;
+ $authedUsers = array();
+ if(!empty($users)) $authedUsers = $users;
if(empty($users))
{
foreach($sprints as $sprint)
@@ -1865,13 +1866,13 @@ class userModel extends model
$stakeholders = zget($stakeholderGroup, $sprint->project, array());
$teams = zget($teamGroups, $sprint->id, array());
- $authUsers += $this->getSprintAuthUsers($sprint, $stakeholders, $teams);
+ $authedUsers += $this->getSprintAuthedUsers($sprint, $stakeholders, $teams);
}
}
/* Get all programs user view. */
- $stmt = $this->dao->select("account,sprints")->from(TABLE_USERVIEW)->where('account')->in($authUsers);
- if(empty($users) and $authUsers)
+ $stmt = $this->dao->select("account,sprints")->from(TABLE_USERVIEW)->where('account')->in($authedUsers);
+ if(empty($users) and $authedUsers)
{
foreach($sprints as $sprintID => $sprint) $stmt->orWhere("CONCAT(',', sprints, ',')")->like("%,{$sprintID},%");
}
@@ -1937,10 +1938,10 @@ class userModel extends model
if($project->type == 'project' && $project->parent != 0 && $project->acl == 'program')
{
$path = trim($project->path, ",$project->id,");
- $programs = $this->dao->select('id,openedBy,PM,PO,QD,RD')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll();
+ $programs = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll();
foreach($programs as $program)
{
- if($program->PO == $account OR $program->QD == $account OR $program->RD == $account OR $program->PM == $account) return true;
+ if($program->PM == $account || $program->openedBy == $account) return true;
}
}
@@ -1995,7 +1996,7 @@ class userModel extends model
}
/**
- * Get project auth users.
+ * Get project authed users.
*
* @param object $project
* @param array $stakeholders
@@ -2003,7 +2004,7 @@ class userModel extends model
* @access public
* @return array
*/
- public function getProjectAuthUsers($project, $stakeholders, $teams)
+ public function getProjectAuthedUsers($project, $stakeholders, $teams)
{
$users = array();
@@ -2022,15 +2023,11 @@ class userModel extends model
if($project->type == 'project' && $project->parent != 0 && $project->acl == 'program')
{
$path = trim($project->path, ",$project->id,");
- $programs = $this->dao->select('id,openedBy,PM,PO,QD,RD')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll();
+ $programs = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll();
foreach($programs as $program)
{
$users[$program->openedBy] = $program->openedBy;
$users[$program->PM] = $program->PM;
- $users[$program->PO] = $program->PO;
- $users[$program->QD] = $program->QD;
- $users[$program->RD] = $program->RD;
-
}
}
@@ -2038,14 +2035,14 @@ class userModel extends model
}
/**
- * Get program auth users.
+ * Get program authed users.
*
* @param object $program
* @param array $stakeholders
* @access public
* @return array
*/
- public function getProgramAuthUsers($program, $stakeholders)
+ public function getProgramAuthedUsers($program, $stakeholders)
{
$users = array();
@@ -2060,7 +2057,7 @@ class userModel extends model
}
/**
- * Get sprint auth users.
+ * Get sprint authed users.
*
* @param object $sprint
* @param array $stakeholders
@@ -2068,9 +2065,9 @@ class userModel extends model
* @access public
* @return array
*/
- public function getSprintAuthUsers($sprint, $stakeholders, $teams)
+ public function getSprintAuthedUsers($sprint, $stakeholders, $teams)
{
- return $this->getProjectAuthUsers($sprint, $stakeholders, $teams);
+ return $this->getProjectAuthedUsers($sprint, $stakeholders, $teams);
}
/**
@@ -2110,42 +2107,6 @@ class userModel extends model
return $users;
}
- /**
- * Get project white list users.
- *
- * @param object $project
- * @param array $groupUsers
- * @param array $teams
- * @access public
- * @return array
- */
- public function getProjectWhiteListUsers($project, $groupUsers, $teams)
- {
- $users = array();
-
- foreach(explode(',', trim($this->app->company->admins, ',')) as $admin) $users[$admin] = $admin;
-
- $users[$project->PO] = $project->PO;
- $users[$project->QD] = $project->QD;
- $users[$project->RD] = $project->RD;
- $users[$project->PM] = $project->PM;
- $users[$project->openedBy] = $project->openedBy;
- if(isset($project->feedback)) $users[$project->feedback] = $project->feedback;
-
- $users += $teams;
-
- if($project->acl == 'custom')
- {
- foreach(explode(',', $project->whitelist) as $whitelist)
- {
- if(empty($whitelist)) continue;
- $users += zget($groupUsers, $whitelist, array());
- }
- }
-
- return $users;
- }
-
/**
* Judge an action is clickable or not.
*