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

* Distinguish project execution from task module.

Browse Source
This commit is contained in:
holan20180123
2021-03-05 09:35:40 +08:00
parent 361af39093
commit a41e43311a
18 changed files with 430 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/view/batchedit.html.php
+3 -3
View File
@@ -80,8 +80,8 @@ js::set('dittoNotice', $dittoNotice);
<?php
if(!isset($execution))
{
$prjInfo = $this->project->getById($tasks[$taskID]->project);
$modules = $this->tree->getOptionMenu($tasks[$taskID]->project, $viewType = 'task');
$prjInfo = $this->execution->getById($tasks[$taskID]->execution);
$modules = $this->tree->getOptionMenu($tasks[$taskID]->execution, $viewType = 'task');
foreach($modules as $moduleID => $moduleName) $modules[$moduleID] = '/' . $prjInfo->name. $moduleName;
$modules = array('ditto' => $this->lang->task->ditto) + $modules;
}
@@ -91,7 +91,7 @@ js::set('dittoNotice', $dittoNotice);
<?php $disableHour = (isset($teams[$taskID]) or $tasks[$taskID]->parent < 0) ? "disabled='disabled'" : '';?>
<?php
$members = array('' => '', 'ditto' => $this->lang->task->ditto);
$teamAccounts = array_keys($executionTeams[$tasks[$taskID]->project]);
$teamAccounts = array_keys($executionTeams[$tasks[$taskID]->execution]);
foreach($teamAccounts as $teamAccount) $members[$teamAccount] = $users[$teamAccount];
$members['closed'] = 'Closed';