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

Merge branch '15.2'

Browse Source
This commit is contained in:
wangyidong
2021-08-02 16:31:42 +08:00
parent 4dd58196d7 545d611d56
commit bbe793a8aa
63 changed files with 359 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+26 -3
View File
@@ -780,7 +780,6 @@ class projectModel extends model
$whitelist = explode(',', $project->whitelist);
$this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
/* Create doc lib. */
$this->app->loadLang('doc');
@@ -962,7 +961,13 @@ class projectModel extends model
$whitelist = explode(',', $project->whitelist);
$this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
if($project->acl != 'open')
{
$this->loadModel('user')->updateUserView($projectID, 'project');
$executions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->fetchPairs('id', 'id');
if($executions) $this->user->updateUserView($executions, 'sprint');
}
if($project->acl == 'private')
{
@@ -1356,7 +1361,7 @@ class projectModel extends model
if($id == 'budget')
{
$projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
$projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
$budgetTitle = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;
$title = "title='$budgetTitle'";
@@ -1367,6 +1372,7 @@ class projectModel extends model
if($id == 'surplus') $title = "title='{$project->hours->totalLeft} {$this->lang->execution->workHour}'";
echo "<td class='$class' $title>";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('project', $project, $id);
switch($id)
{
case 'id':
@@ -1517,6 +1523,23 @@ class projectModel extends model
if($needUpdate) $this->user->updateUserView($needUpdate, 'product', $members);
}
/**
* Update userview for involved product and execution.
*
* @param int $projectID
* @param array $users
* @access public
* @return void
*/
public function updateInvolvedUserView($projectID, $users = array())
{
$products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs('product', 'product');
$this->loadModel('user')->updateUserView($products, 'product', $stakeholder);
$executions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->fetchPairs('id', 'id');
if($executions) $this->user->updateUserView($executions, 'sprint', $stakeholder);
}
/**
* Get team members.
*