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

Merge branch 'sprint/208_tianshujie_58560' into 'master'

Browse Source 
* Finish task #58560.

See merge request easycorp/zentaopms!4202
This commit is contained in:
王怡栋
2022-06-29 00:44:35 +00:00
parent 62fc297642 d597775c7e
commit dde3f2c087
2 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+7 -3
View File
@@ -1261,6 +1261,8 @@ class bug extends control
}
/* Get assigned to member. */
if($this->app->tab == 'execution' or $this->app->tab == 'project')
{
$this->loadModel('project');
$this->loadModel('execution');
@@ -1313,6 +1315,11 @@ class bug extends control
}
}
$this->view->productMembers = $productMembers;
$this->view->projectMembers = $projectMembers;
$this->view->executionMembers = $executionMembers;
}
/* Set users. */
$users = $this->user->getPairs('devfirst', '', $this->config->maxCount);
$users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;
@@ -1330,9 +1337,6 @@ class bug extends control
$this->view->bugs = $bugs;
$this->view->branch = $branch;
$this->view->users = $users;
$this->view->productMembers = $productMembers;
$this->view->projectMembers = $projectMembers;
$this->view->executionMembers = $executionMembers;
$this->view->modules = $modules;
$this->view->branchTagOption = $branchTagOption;
module/bug/view/batchedit.html.php
+8
View File
@@ -104,6 +104,8 @@
<td class='<?php echo zget($visibleFields, 'productplan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plans[$bugID]", $plans, $bug->plan, "class='form-control picker-select' data-drop-width='auto'");?></td>
<?php
$assignedToList = array();
if($app->tab == 'project' or $app->tab == 'execution')
{
if($bug->execution)
{
$assignedToList = array('' => '', 'ditto' => $this->lang->bug->ditto) + $executionMembers[$bug->execution];
@@ -121,6 +123,12 @@
unset($assignedToList['closed']);
}
}
}
else
{
$assignedToList = $users;
unset($assignedToList['closed']);
}
?>
<td class='<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $assignedToList, $bug->assignedTo, "class='form-control picker-select' data-drop-width='135px'");?></td>
<td class='<?php echo zget($visibleFields, 'deadline', ' hidden')?>' style='overflow:visible'><?php echo html::input("deadlines[$bugID]", $bug->deadline, "class='form-control form-date'");?></td>