From 284af0ded110b6ba0a82cf470dd2ffc99e198efc Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 20 Apr 2022 11:02:29 +0800
Subject: [PATCH 1/3]  * Fix bug #21632.

---
 module/common/model.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 7ca52cefe4..96faa52174 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2245,9 +2245,17 @@ EOD;
             }
             else
             {
-                if(helper::isAjaxRequest()) die(json_encode(array('result' => false, 'message' => $this->lang->error->loginTimeout))); // Fix bug #14478.
+                $uri = $this->app->getURI(true);
+                if($module == 'message' and $method == 'ajaxgetmessage')
+                {
+                    $uri = helper::createLink('my');
+                }
+                elseif(helper::isAjaxRequest())
+                {
+                    die(json_encode(array('result' => false, 'message' => $this->lang->error->loginTimeout))); // Fix bug #14478.
+                }
 
-                $referer  = helper::safe64Encode($this->app->getURI(true));
+                $referer = helper::safe64Encode($uri);
                 print(js::locate(helper::createLink('user', 'login', "referer=$referer")));
                 helper::end();
             }

From 006dfea82e2303adb1b6c52f26968f1967470f01 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 20 Apr 2022 11:41:11 +0800
Subject: [PATCH 2/3]  * Fix error.

---
 module/job/model.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/job/model.php b/module/job/model.php
index c1387806d6..00d56de7d3 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -457,12 +457,12 @@ class jobModel extends model
 
         if($job->triggerType == 'tag')
         {
-            $lastTag = $this->getLastTagByRepo($repo, $job);
-            if($lastTag)
+            $job->lastTag = $this->getLastTagByRepo($repo, $job);
+
+            if($job->lastTag)
             {
-                $build->tag   = $lastTag;
-                $job->lastTag = $lastTag;
-                $this->dao->update(TABLE_JOB)->set('lastTag')->eq($lastTag)->where('id')->eq($job->id)->exec();
+                $build->tag = $job->lastTag;
+                $this->dao->update(TABLE_JOB)->set('lastTag')->eq($job->lastTag)->where('id')->eq($job->id)->exec();
             }
         }
 

From 816c36770d94d5e8412b45f51099d737275f750e Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 20 Apr 2022 15:00:13 +0800
Subject: [PATCH 3/3]  * Fix bug #21878.

---
 module/mr/control.php                 | 12 +++++++-----
 module/mr/model.php                   |  1 -
 module/mr/view/header.review.html.php |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/mr/control.php b/module/mr/control.php
index a24ac9d82e..497ba80482 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -422,11 +422,13 @@ class mr extends control
             }
         }
 
-        $this->view->repo     = $this->loadModel('repo')->getRepoByID($MR->repoID);
-        $this->view->repoID   = $MR->repoID;
-        $this->view->diffs    = $diffs;
-        $this->view->encoding = $encoding;
-        $this->view->arrange  = $arrange;
+        $this->view->repo         = $this->loadModel('repo')->getRepoByID($MR->repoID);
+        $this->view->repoID       = $MR->repoID;
+        $this->view->diffs        = $diffs;
+        $this->view->encoding     = $encoding;
+        $this->view->arrange      = $arrange;
+        $this->view->sourceBranch = $MR->sourceBranch;
+        $this->view->targetBranch = $MR->targetBranch;
         $this->display();
     }
 
diff --git a/module/mr/model.php b/module/mr/model.php
index 07d84f3532..712740bb74 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1177,7 +1177,6 @@ class mrModel extends model
             $bugInfo['content']    = $data->steps;
             $bugInfo['title']      = $data->title;
             $bugInfo['objectType'] = 'bug';
-            $bugInfo['entry']      = $data->entry;
             return $bugInfo;
         }
 
diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index 1b6201d186..d6e2032306 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -38,7 +38,8 @@ if($repoExecution)
 }
 
 $reviews = $this->mr->getReview($repoID, $MR->id);
-$v1      = isset($oldRevision) ? $oldRevision : 0;
+$v1      = str_replace('-', '*', $sourceBranch);
+$v2      = str_replace('-', '*', $targetBranch);
 
 $this->loadModel('repo');
 
@@ -46,7 +47,7 @@ $taskModuleSelect    = html::select('taskModule', $taskModules, $taskRepoModule,
 $taskUserSelect      = html::select('taskAssignedTo', $taskMembers, '', 'class="form-control chosen"');
 $taskExecutionSelect = html::select('taskExecution', $taskExecutions, $repoExecution, 'class="form-control chosen" onchange="changeExecution(this)"');
 
-$reviewUrl       = $this->createLink('mr', 'addReview', "repoID=$repoID&mr={$MR->id}&v1=$v1&v2=");
+$reviewUrl       = $this->createLink('mr', 'addReview', "repoID=$repoID&mr={$MR->id}&v1=$v1&v2=$v2");
 $productSelect   = html::select('product', $products, $repoProduct, 'class="product form-control chosen" onchange="changeProduct(this)"');
 $branches        = $this->loadModel('branch')->getPairs($repoProduct);
 $moduleSelect    = html::select('module', $modules, $bugRepoModule, 'class="form-control chosen"');
@@ -153,7 +154,6 @@ js::set('revision', '');
         <td colspan="3" class='form-actions'>
           <?php echo html::submitButton($lang->repo->submit, '', 'btn btn-wide btn-primary reviewSubmit');?>
           <?php echo html::commonButton($lang->cancel, "onclick='hiddenForm()'", 'btn btn-wide');?>
-          <input type="hidden" id='entry' name="entry" value=""/>
         </td>
       </tr>
     </table>