From 98a46445b3aeff51034221086f3be174406d4b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 13 Dec 2021 17:24:52 +0800
Subject: [PATCH 1/3]  * code for bug #17445.

---
 module/mr/view/header.review.html.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index 7292b529b2..15e52c7e2a 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -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();});

From 1bc35c32c485f88fbaa7fb276c3ad8610dac0263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 14 Dec 2021 09:13:50 +0800
Subject: [PATCH 2/3]  * code for task #17444.

---
 module/mr/js/diff.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/mr/js/diff.js b/module/mr/js/diff.js
index fba408bb13..1935957c8a 100644
--- a/module/mr/js/diff.js
+++ b/module/mr/js/diff.js
@@ -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')

From 0899d3ddea67bcf6fc900d808e0082b7ed3b4856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 14 Dec 2021 09:37:42 +0800
Subject: [PATCH 3/3]  code for bug #17465.

---
 api/v1/entries/stories.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/v1/entries/stories.php b/api/v1/entries/stories.php
index d00d8d10a2..af5333b2bc 100644
--- a/api/v1/entries/stories.php
+++ b/api/v1/entries/stories.php
@@ -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'));