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

Merge branch 'sprint/devops16_wangyidong_test' into 'master'

Browse Source 
* code for bug #17445.

See merge request easycorp/zentaopms!920
This commit is contained in:
李玉春
2021-12-14 01:47:24 +00:00
parent 45cdfc8f59 0899d3ddea
commit fb6f913229
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/stories.php
+2 -1
View File
@@ -58,7 +58,8 @@ class storiesEntry extends entry
$this->batchSetPost($fields);
/* If reviewer is not post, set needNotReview. */
if(empty($this->request('reviewer'))) $this->setPost('needNotReview', 1);
$reviewer = $this->request('reviewer');
if(empty($reviewer)) $this->setPost('needNotReview', 1);
$this->setPost('product', $productID);
$this->setPost('type', $this->param('type', 'story'));
module/mr/js/diff.js
+1 -1
View File
@@ -149,7 +149,7 @@ $(document).ready(function()
else
{
$diffCode.addClass('with-action-row');
var line = $row.data('line');
var line = $row.attr('data-line');
if(!$row.hasClass('with-action-row'))
{
$rows.removeClass('with-action-row')
module/mr/view/header.review.html.php
+4 -5
View File
@@ -32,7 +32,7 @@ $taskRepoModule = 0;
$taskMembers = array('' => '');
if($repoExecution)
{
$taskModules = $this->loadModel('tree')->getTaskOptionMenu($repoExecution, 0, 0, 'allModule');
$taskModules = $this->loadModel('tree')->getTaskOptionMenu($repoExecution, 0, 0, '');
$taskRepoModule = (!empty($lastReview->task) && $lastReview->task->execution == $repoExecution) ? $lastReview->task->module : '';
$taskMembers = $this->loadModel('user')->getTeamMemberPairs($repoExecution, 'execution', 'nodeleted');
}
@@ -120,10 +120,9 @@ js::set('revision', '');
</td>
<th><?php echo $lang->repo->type?></th>
<td><?php echo $typeSelect?></td>
<th class='taskModuleBox hide'><?php echo $lang->repo->module?></th>
<td class='taskModuleBox hide'><?php echo $taskModuleSelect?></td>
</tr>
<tr class='taskModuleBox hide'>
<th><?php echo $lang->repo->module?></th>
<td><?php echo $taskModuleSelect?></td>
<tr>
<th><?php echo $lang->repo->assign?></th>
<td>
@@ -239,7 +238,7 @@ function changeExecution(select)
var executionID = $(select).val();
moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'execution=' + executionID + '&viewtype=task&branch=0&rootModuleID=0&returnType=html');
$('.taskModuleBox').find('td:first').load(moduleLink, '', function(){$('.taskModuleBox #module').attr('id', 'taskModule').attr('name', 'taskModule').chosen();});
$('td.taskModuleBox').load(moduleLink, '', function(){$('.taskModuleBox #module').attr('id', 'taskModule').attr('name', 'taskModule').chosen();});
assignLink = createLink('execution', 'ajaxGetMembers', 'executionID=' + executionID);
$('.taskAssignedToBox').load(assignLink, '', function(){$('.taskAssignedToBox #assignedTo').attr('id', 'taskAssignedTo').attr('name', 'taskAssignedTo').chosen();});