From 32b81b45fac1fe69e0da07e8447a11f31917e995 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Dec 2021 08:51:44 +0000
Subject: [PATCH 01/16] * Modify icon.

---
 module/gitlab/view/browse.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php
index c32e725dbb..7446fba68f 100644
--- a/module/gitlab/view/browse.html.php
+++ b/module/gitlab/view/browse.html.php
@@ -50,7 +50,7 @@
             common::printLink('gitlab', 'browseProject', "gitlabID=$id", "<i class='icon icon-list-box'></i> ", '',"title={$lang->gitlab->browseProject} class='btn btn-primary'");
             common::printLink('gitlab', 'browseGroup', "gitlabID=$id", "<i class='icon icon-groups'></i> ", '', "title={$lang->gitlab->browseGroup}  class='btn btn-primary'");
             common::printLink('gitlab', 'edit', "gitlabID=$id", "<i class='icon icon-edit'></i> ", '',"title={$lang->gitlab->edit} class='btn btn-primary'");
-            common::printLink('gitlab', 'browseUser', "gitlabID=$id", "<i class='icon icon-persons'></i> ", '', "title={$lang->gitlab->browseUser}  class='btn {$disabled}' ,'disabled'");
+            common::printLink('gitlab', 'browseUser', "gitlabID=$id", "<i class='icon icon-person'></i> ", '', "title={$lang->gitlab->browseUser}  class='btn {$disabled}' ,'disabled'");
             common::printLink('gitlab', 'bindUser', "id=$id", "<i class='icon icon-link'></i> ", '', "title={$lang->gitlab->bindUser}  class='btn {$disabled}' ,'disabled'");
             if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'");
             ?>

From 8249473e63dd2b8982519d85978c140acc626e83 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 01:25:55 +0000
Subject: [PATCH 02/16] * Finish task #45499.

---
 module/gitlab/config.php                     |   3 +
 module/gitlab/control.php                    | 111 ++++++++++++++++
 module/gitlab/css/setbranchpriv.css          |   2 +
 module/gitlab/js/browsebranchpriv.js         |  17 +++
 module/gitlab/lang/en.php                    |  21 ++-
 module/gitlab/lang/zh-cn.php                 |  21 ++-
 module/gitlab/model.php                      | 131 +++++++++++++++++++
 module/gitlab/view/browsebranchpriv.html.php |  76 +++++++++++
 module/gitlab/view/browseproject.html.php    |   3 +-
 module/gitlab/view/setbranchpriv.html.php    |  47 +++++++
 module/group/lang/resource.php               |   3 +
 11 files changed, 432 insertions(+), 3 deletions(-)
 create mode 100644 module/gitlab/css/setbranchpriv.css
 create mode 100644 module/gitlab/js/browsebranchpriv.js
 create mode 100644 module/gitlab/view/browsebranchpriv.html.php
 create mode 100644 module/gitlab/view/setbranchpriv.html.php

diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index 5f41d70ceb..312980ad04 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -5,6 +5,9 @@ $config->gitlab->create->requiredFields = 'name,url,token';
 $config->gitlab->edit = new stdclass;
 $config->gitlab->edit->requiredFields = 'name,url,token';
 
+$config->gitlab->setbranchpriv = new stdclass;
+$config->gitlab->setbranchpriv->requiredFields = 'name';
+
 $config->gitlab->labelPattern = new stdclass;
 $config->gitlab->labelPattern->task  = '/^zentao_task\/\d+$/';
 $config->gitlab->labelPattern->bug   = '/^zentao_bug\/\d+$/';
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index e56cae595d..b9ab2a0aeb 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -712,6 +712,117 @@ class gitlab extends control
         die(js::alert($reponse->message));
     }
 
+    /**
+     * Browse gitlab branch priv.
+     *
+     * @param  int    $gitlabID
+     * @param  string $keyword
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
+     * @access public
+     * @return void
+     */
+    public function browseBranchPriv($gitlabID, $projectID, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
+    {
+        $keyword  = fixer::input('post')->setDefault('keyword', '')->get('keyword');
+        $branches = $this->gitlab->apiGetBranchPrivs($gitlabID, $projectID, $keyword, $orderBy);
+
+        /* Pager. */
+        $this->app->loadClass('pager', $static = true);
+        $recTotal   = count($branches);
+        $pager      = new pager($recTotal, $recPerPage, $pageID);
+        $branchList = array_chunk($branches, $pager->recPerPage);
+
+        $this->view->keyword    = urldecode(urldecode($keyword));
+        $this->view->pager      = $pager;
+        $this->view->title      = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseBranchPriv;
+        $this->view->levelLang  = $this->lang->gitlab->branch->branchCreationLevelList;
+        $this->view->gitlabID   = $gitlabID;
+        $this->view->projectID  = $projectID;
+        $this->view->orderBy    = $orderBy;
+        $this->view->branchList = empty($branchList) ? $branchList: $branchList[$pageID - 1];
+        $this->display();
+    }
+
+    /**
+     * Set a gitlab branch priv.
+     *
+     * @param  int     $gitlabID
+     * @param  int     $projectID
+     * @access public
+     * @return void
+     */
+    public function setBranchPriv($gitlabID, $projectID, $branch = '')
+    {
+        if($_POST)
+        {
+            $this->gitlab->createBranchPriv($gitlabID, $projectID, $branch);
+
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browseBranchPriv', "gitlabID=$gitlabID&projectID=$projectID")));
+        }
+
+        $branchPriv = new stdClass();
+        $branchPriv->name               = '';
+        $branchPriv->merge_access_level = 40;
+        $branchPriv->push_access_level  = 40;
+
+        $gitlab = $this->gitlab->getByID($gitlabID);
+        $title  = $this->lang->gitlab->branch->createBranchPriv;
+
+        if($branch)
+        {
+            $title      = $this->lang->gitlab->branch->editBranchPriv;
+            $branchPriv = $this->gitlab->apiGetSingleBranchPriv($gitlabID, $projectID, $branch);
+            $branchPriv->merge_access_level = $this->gitlab->checkAccessLevel($branchPriv->merge_access_levels);
+            $branchPriv->push_access_level  = $this->gitlab->checkAccessLevel($branchPriv->push_access_levels);
+        }
+
+        $gitlabBranches  = $this->gitlab->apiGetBranches($gitlabID, $projectID);
+        $protectBranches = $this->gitlab->apiGetBranchPrivs($gitlabID, $projectID, '', 'name_asc');
+        $protectNames    = array_keys($protectBranches);
+
+        $branches = array();
+        foreach($gitlabBranches as $oneBranch) {
+            if(!in_array($oneBranch->name, $protectNames) || $oneBranch->name == $branch) $branches[$oneBranch->name] = $oneBranch->name;
+        }
+
+        $this->view->title      = $this->lang->gitlab->common . $this->lang->colon . $title;
+        $this->view->pageTitle  = $title;
+        $this->view->gitlab     = $gitlab;
+        $this->view->gitlabID   = $gitlabID;
+        $this->view->branch     = $branch;
+        $this->view->projectID  = $projectID;
+        $this->view->branches   = $branches; 
+        $this->view->branchPriv = $branchPriv; 
+        $this->display();
+    }
+
+    /**
+     * Delete a gitlab branch priv.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @access public
+     * @return void
+     */
+    public function deleteBranchPriv($gitlabID, $projectID, $branch, $confirm = 'no')
+    {
+        if($confirm != 'yes') die(js::confirm($this->lang->gitlab->branch->confirmDelete , inlink('deleteBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch&confirm=yes")));
+
+        $reponse = $this->gitlab->apiDeleteBranchPriv($gitlabID, $projectID, $branch);
+
+        /* If the status code beginning with 20 is returned or empty is returned, it is successful. */
+        if(!$reponse or substr($reponse->message, 0, 2) == '20')
+        {
+            $this->loadModel('action')->create('gitlabbranchPriv', $branch, 'deleted', '', $branch);
+            die(js::reload('parent'));
+        }
+
+        die(js::alert($reponse->message));
+    }
+
     /**
      * Import gitlab issue to zentaopms.
      *
diff --git a/module/gitlab/css/setbranchpriv.css b/module/gitlab/css/setbranchpriv.css
new file mode 100644
index 0000000000..025aeb5e7f
--- /dev/null
+++ b/module/gitlab/css/setbranchpriv.css
@@ -0,0 +1,2 @@
+.table-form>tbody>tr>th {width: 110px;}
+.table-form {width: 50%;}
diff --git a/module/gitlab/js/browsebranchpriv.js b/module/gitlab/js/browsebranchpriv.js
new file mode 100644
index 0000000000..33077a1755
--- /dev/null
+++ b/module/gitlab/js/browsebranchpriv.js
@@ -0,0 +1,17 @@
+$(document).ready(function()
+{
+    $('#branchSearch').click(function()
+    {
+        triggerSearch();
+    });
+    $('#keyword').keypress(function(event)
+    {
+        if(event.which == 13) triggerSearch();
+    })
+
+});
+
+function triggerSearch()
+{
+    $("#branchPrivForm").submit();
+}
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 07c7ad4e7f..799b0aabd2 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -45,6 +45,9 @@ $lang->gitlab->editUser             = 'Edit user';
 $lang->gitlab->deleteUser           = 'Delete user';
 $lang->gitlab->manageGroupMembers   = 'Manage group member';
 $lang->gitlab->createWebhook        = 'Create Webhook';
+$lang->gitlab->browseBranchPriv     = 'Protect branch';
+$lang->gitlab->setBranchPriv        = 'Set up branch protected';
+$lang->gitlab->deleteBranchPriv     = 'Delete branch protected';
 
 $lang->gitlab->id             = 'ID';
 $lang->gitlab->name           = "GitLab Name";
@@ -122,7 +125,7 @@ $lang->gitlab->user->projectsLimit  = "Projects limit";
 $lang->gitlab->user->canCreateGroup = "Can create group";
 $lang->gitlab->user->external       = "External";
 $lang->gitlab->user->externalTip    = "External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.";
-$lang->gitlab->user->bind           = "Bind Zentao user";
+$lang->gitlab->user->bind           = "Zentao user";
 $lang->gitlab->user->avatar         = "Avatar";
 $lang->gitlab->user->skype          = "Skype";
 $lang->gitlab->user->linkedin       = "Linkedin";
@@ -171,3 +174,19 @@ $lang->gitlab->group->memberName                              = 'Account';
 $lang->gitlab->group->memberAccessLevel                       = 'Access Level';
 $lang->gitlab->group->memberExpiresAt                         = 'Expiration time';
 $lang->gitlab->group->repeatError                             = "Group members cannot be added repeatedly";
+
+$lang->gitlab->branch = new stdclass;
+$lang->gitlab->branch->accessLevel                 = "Branch protection list";
+$lang->gitlab->branch->name                        = "Branch name";
+$lang->gitlab->branch->mergeAllowed                = "Merge Allowed";
+$lang->gitlab->branch->pushAllowed                 = "Push Allowed";
+$lang->gitlab->branch->placeholderSearch           = "Branch name";
+$lang->gitlab->branch->placeholderSelect           = "Branch name";
+$lang->gitlab->branch->confirmDelete               = 'Branch will be writable for developers. Are you sure?';
+$lang->gitlab->branch->createBranchPriv            = 'Create branch protection';
+$lang->gitlab->branch->editBranchPriv              = 'Edit branch protection';
+$lang->gitlab->branch->branchCreationLevelList[40] = "Maintainers";
+$lang->gitlab->branch->branchCreationLevelList[30] = "Developers + Maintainers";
+$lang->gitlab->branch->branchCreationLevelList[0]  = "No one";
+$lang->gitlab->branch->emptyPrivNameError          = "Branch cannot be empty.";
+$lang->gitlab->branch->issetPrivNameError          = "The protection branch already exists";
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index d911572925..c00cf7b5b8 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -45,6 +45,9 @@ $lang->gitlab->editUser             = '编辑用户';
 $lang->gitlab->deleteUser           = '删除用户';
 $lang->gitlab->manageGroupMembers   = '群组成员管理';
 $lang->gitlab->createWebhook        = '创建Webhook';
+$lang->gitlab->browseBranchPriv     = '分支保护管理';
+$lang->gitlab->setBranchPriv        = '设置分支保护';
+$lang->gitlab->deleteBranchPriv     = '删除分支保护';
 
 $lang->gitlab->id             = 'ID';
 $lang->gitlab->name           = "{$lang->gitlab->common}名称";
@@ -122,7 +125,7 @@ $lang->gitlab->user->projectsLimit  = "限制项目";
 $lang->gitlab->user->canCreateGroup = "可创建组";
 $lang->gitlab->user->external       = "外部人员";
 $lang->gitlab->user->externalTip    = "除非明确授予访问权限，否则外部用户无法查看内部或私有项目。另外，外部用户无法创建项目，群组或个人代码片段。";
-$lang->gitlab->user->bind           = "绑定禅道用户";
+$lang->gitlab->user->bind           = "禅道用户";
 $lang->gitlab->user->avatar         = "头像";
 $lang->gitlab->user->skype          = "Skype";
 $lang->gitlab->user->linkedin       = "Linkedin";
@@ -171,3 +174,19 @@ $lang->gitlab->group->memberName                              = '账号';
 $lang->gitlab->group->memberAccessLevel                       = '角色权限';
 $lang->gitlab->group->memberExpiresAt                         = '过期时间';
 $lang->gitlab->group->repeatError                             = "群组成员不能重复添加";
+
+$lang->gitlab->branch = new stdclass;
+$lang->gitlab->branch->accessLevel                 = "分支保护列表";
+$lang->gitlab->branch->name                        = "分支名称";
+$lang->gitlab->branch->mergeAllowed                = "允许合并到";
+$lang->gitlab->branch->pushAllowed                 = "允许推送到";
+$lang->gitlab->branch->placeholderSearch           = "请输入分支名称";
+$lang->gitlab->branch->placeholderSelect           = "请选择分支";
+$lang->gitlab->branch->confirmDelete               = '确定删除分支保护？';
+$lang->gitlab->branch->createBranchPriv            = '创建分支保护';
+$lang->gitlab->branch->editBranchPriv              = '编辑分支保护';
+$lang->gitlab->branch->branchCreationLevelList[40] = "维护者";
+$lang->gitlab->branch->branchCreationLevelList[30] = "开发者 + 维护者";
+$lang->gitlab->branch->branchCreationLevelList[0]  = "禁止";
+$lang->gitlab->branch->emptyPrivNameError          = "分支不能为空";
+$lang->gitlab->branch->issetPrivNameError          = "已存在该保护分支";
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 437a2a05ce..8ba4c6a5e6 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -2287,4 +2287,135 @@ class gitlabModel extends model
             ->andWhere('path')->in($projectIDs)
             ->fetchPairs('path', 'product');
     }
+
+    /**
+     * Get branch priv of one project.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $keyword
+     * @param  string $orderBy
+     * @param  object $pager
+     * @access public
+     * @return array
+     */
+    public function apiGetBranchPrivs($gitlabID, $projectID, $keyword = '', $orderBy = 'id_desc')
+    {
+        $keyword  = urlencode($keyword);
+        $url      = sprintf($this->getApiRoot($gitlabID), "/projects/$projectID/protected_branches");
+        $branches = json_decode(commonModel::http($url));
+
+        /* Parse order string. */
+        $order = explode('_', $orderBy);
+
+        $newBranches = array();
+        foreach($branches as $branch)
+        {
+            if(empty($keyword) || stristr($branch->name, $keyword)) $newBranches[$branch->$order[0]] = $branch;
+        }
+
+        if($order[1] == 'asc')  ksort($newBranches);
+        if($order[1] == 'desc') krsort($newBranches);
+
+        return $newBranches;
+    }
+
+    /**
+     * Get single branch priv by API.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
+     * @access public
+     * @return object
+     */
+    public function apiGetSingleBranchPriv($gitlabID, $projectID, $branch)
+    {
+        $url = sprintf($this->getApiRoot($gitlabID), "/projects/$projectID/protected_branches/$branch");
+        return json_decode(commonModel::http($url));
+    }
+
+    /**
+     * Create gitlab branch priv.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
+     * @access public
+     * @return bool
+     */
+    public function createBranchPriv($gitlabID, $projectID, $branch = '')
+    {
+        $priv = fixer::input('post')->get();
+        if(empty($priv->name)) dao::$errors['name'][] = $this->lang->gitlab->branch->emptyPrivNameError;
+        $singleBranch = $this->apiGetSingleBranchPriv($gitlabID, $projectID, $priv->name);
+        if(empty($branch) && !empty($singleBranch->id)) dao::$errors['name'][] = $this->lang->gitlab->branch->issetPrivNameError;
+        if(dao::isError()) return false;
+        if(!empty($branch) && !empty($singleBranch->id)) $this->apiDeleteBranchPriv($gitlabID, $projectID, $branch); 
+
+        $response = $this->apiCreateBranchPriv($gitlabID, $projectID, $priv); 
+
+        if(!empty($response->id))
+        {
+            $action = empty($branch) ? 'created' : 'edited';
+            $this->loadModel('action')->create('gitlabbranchpriv', $response->id, $action, '', $response->name);
+            return true;
+        }
+
+        return $this->apiErrorHandling($response);
+    }
+
+    /**
+     * Create a gitab protect branch by api.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  object $priv
+     * @access public
+     * @return object
+     */
+    public function apiCreateBranchPriv($gitlabID, $projectID, $priv)
+    {
+        if(empty($priv->name)) return false;
+        $url = sprintf($this->getApiRoot($gitlabID), "/projects/" . $projectID . '/protected_branches');
+        return json_decode(commonModel::http($url, $priv));
+    }
+
+    /**
+     * Delete a gitab branch priv by api.
+     *
+     * @param  int $gitlabID
+     * @param  int $groupID
+     * @param  int $memberID
+     * @access public
+     * @return object
+     */
+    public function apiDeleteBranchPriv($gitlabID, $projectID, $branch)
+    {
+        $apiRoot = $this->getApiRoot($gitlabID);
+        $url     = sprintf($apiRoot, "/projects/{$projectID}/protected_branches/{$branch}");
+        return json_decode(commonModel::http($url, array(), $options = array(CURLOPT_CUSTOMREQUEST => 'DELETE')));
+    }
+
+    /**
+     * Check access level.
+     *
+     * @param  array $accessLevels
+     * @access public
+     * @return int
+     */
+    public function checkAccessLevel($accessLevels)
+    {
+        $noAccess         = 0;
+        $developerAccess  = 30;
+        $maintainerAccess = 40;
+        if(is_array($accessLevels))
+        {
+            $levels = array();
+            foreach($accessLevels as $level) $levels[] = (int)$level->access_level;
+            if(in_array($noAccess, $levels)) return $noAccess;
+            if(in_array($developerAccess, $levels)) return $developerAccess;
+        }
+        return $maintainerAccess;
+    }
 }
diff --git a/module/gitlab/view/browsebranchpriv.html.php b/module/gitlab/view/browsebranchpriv.html.php
new file mode 100644
index 0000000000..e94a3a0c43
--- /dev/null
+++ b/module/gitlab/view/browsebranchpriv.html.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * The browse view file of gitlab branch priv of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Gang Liu <liugang@cnezsoft.com>
+ * @package     gitlab
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class='pull-left'>
+    <?php echo html::a($this->createLink('gitlab', 'browseProject', "gitlabID=$gitlabID"), "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-secondary'");?>
+  </div>
+  <div class="btn-toolbar pull-left">
+    <div>
+      <form id='branchPrivForm' method='post'>
+      <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->branch->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
+      <a id="branchSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
+      </form>
+    </div>
+  </div>
+  <div class="btn-toolbar pull-right">
+    <?php if(common::hasPriv('gitlab', 'setBranchPriv')) common::printLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->branch->createBranchPriv, '', "class='btn btn-primary'");?>
+  </div>
+</div>
+<?php if(empty($branchList)):?>
+<div class="table-empty-tip">
+  <p>
+    <span class="text-muted"><?php echo $lang->noData;?></span>
+    <?php if(empty($keyword) and common::hasPriv('gitlab', 'createProject')):?>
+    <?php echo html::a($this->createLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->gitlab->branch->createBranchPriv, '', "class='btn btn-info'");?>
+    <?php endif;?>
+  </p>
+</div>
+<?php else:?>
+<div id='mainContent' class='main-row'>
+  <form class='main-table' id='ajaxForm' method='post'>
+    <table id='branchList' class='table has-sort-head table-fixed'>
+      <?php $vars = "gitlabID={$gitlabID}&projectID={$projectID}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+      <thead>
+        <tr>
+          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->branch->name);?></th>
+          <th class='text-left'><?php echo $lang->gitlab->branch->mergeAllowed;?></th>
+          <th class='text-left'><?php echo $lang->gitlab->branch->pushAllowed;?></th>
+          <th class='c-actions-4'><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($branchList as $id => $branch): ?>
+        <?php $branch->merge_access_level = count($branch->merge_access_levels) > 1 ? 40 : $branch->merge_access_levels[0]->access_level; ?>
+        <?php $branch->push_access_level  = count($branch->push_access_levels) > 1 ? 40 : $branch->push_access_levels[0]->access_level; ?>
+        <tr class='text'>
+          <td class='text-c-name' title='<?php echo $branch->name;?>'><?php echo $branch->name;?></td>
+          <td class-'text' title="<?php echo $levelLang[$branch->merge_access_level];?>"><?php echo $levelLang[$branch->merge_access_level];?></td>
+          <td class='text' title="<?php echo $levelLang[$branch->push_access_level];?>"><?php echo $levelLang[$branch->push_access_level];?></td>
+          <td class='c-actions text-left'>
+            <?php
+            if(common::hasPriv('gitlab', 'setBranchPriv')) common::printLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->branch->editBranchPriv} class='btn btn-primary'");
+            if(common::hasPriv('gitlab', 'deleteBranchPriv')) echo html::a($this->createLink('gitlab', 'deleteBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteBranchPriv}' class='btn'");
+            ?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <?php if($branchList):?>
+    <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+    <?php endif;?>
+  </form>
+</div>
+<?php endif;?>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/gitlab/view/browseproject.html.php b/module/gitlab/view/browseproject.html.php
index 40eea5877c..477718a116 100644
--- a/module/gitlab/view/browseproject.html.php
+++ b/module/gitlab/view/browseproject.html.php
@@ -15,7 +15,7 @@
 <?php js::set('gitlabID', $gitlabID)?>
 <div id="mainMenu" class="clearfix">
   <div class='pull-left'>
-    <?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary');?>
+    <?php echo html::a($this->createLink('gitlab', 'browse'), "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-secondary'");?>
   </div>
   <div id="sidebarHeader">
     <div class="title"><?php echo $this->lang->gitlab->common . ':' . $gitlab->name; ?></div>
@@ -67,6 +67,7 @@
           <td class='text' title='<?php echo substr($gitlabProject->last_activity_at, 0, 10);?>'><?php echo substr($gitlabProject->last_activity_at, 0, 10);?></td>
           <td class='c-actions text-left'>
             <?php
+            common::printLink('gitlab', 'browseBranchPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-lock'></i> ", '', "title={$lang->gitlab->branch->accessLevel} class='btn btn-primary'");
             common::printLink('gitlab', 'editProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->project->edit} class='btn btn-primary'");
             if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteProject}' class='btn'");
             ?>
diff --git a/module/gitlab/view/setbranchpriv.html.php b/module/gitlab/view/setbranchpriv.html.php
new file mode 100644
index 0000000000..25cd246d53
--- /dev/null
+++ b/module/gitlab/view/setbranchpriv.html.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * The create view file of gitlab module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Gang Liu <liugang@cnezsoft.com>
+ * @package     gitlab
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div id='mainContent' class='main-row'>
+  <div class='main-col main-content'>
+    <div class='center-block'>
+      <div class='main-header'>
+        <h2><?php echo $pageTitle;?></h2>
+      </div>
+      <form id='branchForm' method='post' class='form-ajax' enctype="multipart/form-data">
+        <?php if($branch) echo html::hidden('name', $branch);?>
+        <table class='table table-form'>
+          <tr>
+            <th><?php echo $lang->gitlab->branch->name;?></th>
+            <td><?php echo html::select('name', $branches, $branchPriv->name, "class='form-control chosen' data-placeholder='{$lang->gitlab->branch->placeholderSelect}' " . ($branch ? 'disabled' : ''));?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->gitlab->branch->mergeAllowed;?></th>
+            <td><?php echo html::select('merge_access_level', $lang->gitlab->branch->branchCreationLevelList, $branchPriv->merge_access_level, "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->gitlab->branch->pushAllowed;?></th>
+            <td><?php echo html::select('push_access_level', $lang->gitlab->branch->branchCreationLevelList, $branchPriv->push_access_level, "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th></th>
+            <td class='text-center form-actions'>
+              <?php echo html::submitButton();?>
+              <?php if(!isonlybody()) echo html::a(inlink('browseBranchPriv', "gitlabID=$gitlabID&projectID=$projectID"), $lang->goback, '', 'class="btn btn-wide"');?>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </div>
+  </div>
+</div>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index f4abbb41bb..12a3be57f2 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1248,6 +1248,9 @@ $lang->resource->gitlab->deleteUser           = 'deleteUser';
 $lang->resource->gitlab->webhook              = 'webhook';
 $lang->resource->gitlab->createWebhook        = 'createWebhook';
 $lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers';
+$lang->resource->gitlab->browseBranchPriv     = 'browseBranchPriv';
+$lang->resource->gitlab->setBranchPriv        = 'setBranchPriv';
+$lang->resource->gitlab->deleteBranchPriv     = 'deleteBranchPriv';
 
 $lang->gitlab->methodOrder[5]   = 'browse';
 $lang->gitlab->methodOrder[10]  = 'create';

From a8abcb6c9f09c5a875620a62ca9b5ef09a830eda Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 02:14:37 +0000
Subject: [PATCH 03/16] * Add create and edit auth.

---
 module/gitlab/control.php                     | 27 ++++++++++++++-----
 ...setbranchpriv.css => createbranchpriv.css} |  0
 module/gitlab/lang/en.php                     |  5 ++--
 module/gitlab/lang/zh-cn.php                  |  5 ++--
 module/gitlab/view/browsebranchpriv.html.php  |  6 ++---
 ...riv.html.php => createbranchpriv.html.php} |  0
 module/group/lang/resource.php                |  3 ++-
 7 files changed, 30 insertions(+), 16 deletions(-)
 rename module/gitlab/css/{setbranchpriv.css => createbranchpriv.css} (100%)
 rename module/gitlab/view/{setbranchpriv.html.php => createbranchpriv.html.php} (100%)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index b9ab2a0aeb..3fed1904c8 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -746,14 +746,15 @@ class gitlab extends control
     }
 
     /**
-     * Set a gitlab branch priv.
+     * Set a gitlab branch protect.
      *
-     * @param  int     $gitlabID
-     * @param  int     $projectID
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
      * @access public
      * @return void
      */
-    public function setBranchPriv($gitlabID, $projectID, $branch = '')
+    public function createBranchPriv($gitlabID, $projectID, $branch = '')
     {
         if($_POST)
         {
@@ -769,11 +770,11 @@ class gitlab extends control
         $branchPriv->push_access_level  = 40;
 
         $gitlab = $this->gitlab->getByID($gitlabID);
-        $title  = $this->lang->gitlab->branch->createBranchPriv;
+        $title  = $this->lang->gitlab->createBranchPriv;
 
         if($branch)
         {
-            $title      = $this->lang->gitlab->branch->editBranchPriv;
+            $title      = $this->lang->gitlab->editBranchPriv;
             $branchPriv = $this->gitlab->apiGetSingleBranchPriv($gitlabID, $projectID, $branch);
             $branchPriv->merge_access_level = $this->gitlab->checkAccessLevel($branchPriv->merge_access_levels);
             $branchPriv->push_access_level  = $this->gitlab->checkAccessLevel($branchPriv->push_access_levels);
@@ -799,6 +800,20 @@ class gitlab extends control
         $this->display();
     }
 
+    /**
+     * Edit a gitlab branch protect.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
+     * @access public
+     * @return void
+     */
+    public function editBranchPriv($gitlabID, $projectID, $branch)
+    {
+        echo $this->fetch('gitlab', 'createBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch");
+    }
+
     /**
      * Delete a gitlab branch priv.
      *
diff --git a/module/gitlab/css/setbranchpriv.css b/module/gitlab/css/createbranchpriv.css
similarity index 100%
rename from module/gitlab/css/setbranchpriv.css
rename to module/gitlab/css/createbranchpriv.css
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 799b0aabd2..58e31f7302 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -46,7 +46,8 @@ $lang->gitlab->deleteUser           = 'Delete user';
 $lang->gitlab->manageGroupMembers   = 'Manage group member';
 $lang->gitlab->createWebhook        = 'Create Webhook';
 $lang->gitlab->browseBranchPriv     = 'Protect branch';
-$lang->gitlab->setBranchPriv        = 'Set up branch protected';
+$lang->gitlab->createBranchPriv     = 'Cerate branch protected';
+$lang->gitlab->editBranchPriv       = 'Edit branch protected';
 $lang->gitlab->deleteBranchPriv     = 'Delete branch protected';
 
 $lang->gitlab->id             = 'ID';
@@ -183,8 +184,6 @@ $lang->gitlab->branch->pushAllowed                 = "Push Allowed";
 $lang->gitlab->branch->placeholderSearch           = "Branch name";
 $lang->gitlab->branch->placeholderSelect           = "Branch name";
 $lang->gitlab->branch->confirmDelete               = 'Branch will be writable for developers. Are you sure?';
-$lang->gitlab->branch->createBranchPriv            = 'Create branch protection';
-$lang->gitlab->branch->editBranchPriv              = 'Edit branch protection';
 $lang->gitlab->branch->branchCreationLevelList[40] = "Maintainers";
 $lang->gitlab->branch->branchCreationLevelList[30] = "Developers + Maintainers";
 $lang->gitlab->branch->branchCreationLevelList[0]  = "No one";
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index c00cf7b5b8..7ab1ea653c 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -46,7 +46,8 @@ $lang->gitlab->deleteUser           = '删除用户';
 $lang->gitlab->manageGroupMembers   = '群组成员管理';
 $lang->gitlab->createWebhook        = '创建Webhook';
 $lang->gitlab->browseBranchPriv     = '分支保护管理';
-$lang->gitlab->setBranchPriv        = '设置分支保护';
+$lang->gitlab->createBranchPriv     = '创建分支保护';
+$lang->gitlab->editBranchPriv       = '编辑分支保护';
 $lang->gitlab->deleteBranchPriv     = '删除分支保护';
 
 $lang->gitlab->id             = 'ID';
@@ -183,8 +184,6 @@ $lang->gitlab->branch->pushAllowed                 = "允许推送到";
 $lang->gitlab->branch->placeholderSearch           = "请输入分支名称";
 $lang->gitlab->branch->placeholderSelect           = "请选择分支";
 $lang->gitlab->branch->confirmDelete               = '确定删除分支保护？';
-$lang->gitlab->branch->createBranchPriv            = '创建分支保护';
-$lang->gitlab->branch->editBranchPriv              = '编辑分支保护';
 $lang->gitlab->branch->branchCreationLevelList[40] = "维护者";
 $lang->gitlab->branch->branchCreationLevelList[30] = "开发者 + 维护者";
 $lang->gitlab->branch->branchCreationLevelList[0]  = "禁止";
diff --git a/module/gitlab/view/browsebranchpriv.html.php b/module/gitlab/view/browsebranchpriv.html.php
index e94a3a0c43..4697480e78 100644
--- a/module/gitlab/view/browsebranchpriv.html.php
+++ b/module/gitlab/view/browsebranchpriv.html.php
@@ -24,7 +24,7 @@
     </div>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(common::hasPriv('gitlab', 'setBranchPriv')) common::printLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->branch->createBranchPriv, '', "class='btn btn-primary'");?>
+    <?php if(common::hasPriv('gitlab', 'createBranchPriv')) common::printLink('gitlab', 'createBranchPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->createBranchPriv, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <?php if(empty($branchList)):?>
@@ -32,7 +32,7 @@
   <p>
     <span class="text-muted"><?php echo $lang->noData;?></span>
     <?php if(empty($keyword) and common::hasPriv('gitlab', 'createProject')):?>
-    <?php echo html::a($this->createLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->gitlab->branch->createBranchPriv, '', "class='btn btn-info'");?>
+    <?php echo html::a($this->createLink('gitlab', 'createBranchPriv', "gitlabID=$gitlabID&projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->gitlab->createBranchPriv, '', "class='btn btn-info'");?>
     <?php endif;?>
   </p>
 </div>
@@ -59,7 +59,7 @@
           <td class='text' title="<?php echo $levelLang[$branch->push_access_level];?>"><?php echo $levelLang[$branch->push_access_level];?></td>
           <td class='c-actions text-left'>
             <?php
-            if(common::hasPriv('gitlab', 'setBranchPriv')) common::printLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->branch->editBranchPriv} class='btn btn-primary'");
+            if(common::hasPriv('gitlab', 'editBranchPriv')) common::printLink('gitlab', 'editBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->editBranchPriv} class='btn btn-primary'");
             if(common::hasPriv('gitlab', 'deleteBranchPriv')) echo html::a($this->createLink('gitlab', 'deleteBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteBranchPriv}' class='btn'");
             ?>
           </td>
diff --git a/module/gitlab/view/setbranchpriv.html.php b/module/gitlab/view/createbranchpriv.html.php
similarity index 100%
rename from module/gitlab/view/setbranchpriv.html.php
rename to module/gitlab/view/createbranchpriv.html.php
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 12a3be57f2..d39f8f0c06 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1249,7 +1249,8 @@ $lang->resource->gitlab->webhook              = 'webhook';
 $lang->resource->gitlab->createWebhook        = 'createWebhook';
 $lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers';
 $lang->resource->gitlab->browseBranchPriv     = 'browseBranchPriv';
-$lang->resource->gitlab->setBranchPriv        = 'setBranchPriv';
+$lang->resource->gitlab->createBranchPriv     = 'createBranchPriv';
+$lang->resource->gitlab->editBranchPriv       = 'editBranchPriv';
 $lang->resource->gitlab->deleteBranchPriv     = 'deleteBranchPriv';
 
 $lang->gitlab->methodOrder[5]   = 'browse';

From f1689b4dea0fe3bcf2c30a0afc49e431b7242f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 9 Dec 2021 11:24:14 +0800
Subject: [PATCH 04/16]  * code for task #45504.

---
 db/update16.0.beta1.sql               |   7 +
 module/mr/control.php                 |  38 +--
 module/mr/css/common.css              |  40 +--
 module/mr/js/diff.js                  | 376 ++++++--------------------
 module/mr/lang/zh-cn.php              |   7 +-
 module/mr/model.php                   | 195 ++++++++++---
 module/mr/view/diff.html.php          |   2 +-
 module/mr/view/header.review.html.php | 262 +++++++++---------
 module/repo/lang/zh-cn.php            |   1 +
 9 files changed, 427 insertions(+), 501 deletions(-)
 create mode 100644 db/update16.0.beta1.sql

diff --git a/db/update16.0.beta1.sql b/db/update16.0.beta1.sql
new file mode 100644
index 0000000000..6634ac2b81
--- /dev/null
+++ b/db/update16.0.beta1.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `zt_task` ADD `repo` mediumint unsigned NOT NULL AFTER `activatedDate`;
+ALTER TABLE `zt_task` ADD `entry` varchar(255) NOT NULL AFTER `repo`;
+ALTER TABLE `zt_task` ADD `lines` varchar(10) NOT NULL AFTER `entry`;
+ALTER TABLE `zt_task` ADD `v1` varchar(40) NOT NULL AFTER `lines`;
+ALTER TABLE `zt_task` ADD `v2` varchar(40) NOT NULL AFTER `v1`;
+ALTER TABLE `zt_task` ADD `mr` mediumint(8) unsigned NOT NULL AFTER `repo`;
+ALTER TABLE `zt_bug` ADD `mr` mediumint(8) unsigned NOT NULL AFTER `repo`;
diff --git a/module/mr/control.php b/module/mr/control.php
index aba3903a58..b8eb5917c6 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -300,7 +300,7 @@ class mr extends control
      * @access public
      * @return void
      */
-    public function diff($MRID, $encoding= '')
+    public function diff($MRID, $encoding = '')
     {
         $this->app->loadLang('productplan');
         $this->app->loadLang('bug');
@@ -316,7 +316,7 @@ class mr extends control
         $this->view->rawMR = $rawMR;
         if(!isset($rawMR->id) or (isset($rawMR->message) and $rawMR->message == '404 Not found') or empty($rawMR)) return $this->display();
 
-        $diffs   = $this->mr->getDiffs($MR, $encoding = '');
+        $diffs   = $this->mr->getDiffs($MR, $encoding);
         $arrange = $this->cookie->arrange ? $this->cookie->arrange : 'inline';
 
         if($this->server->request_method == 'POST')
@@ -782,49 +782,37 @@ class mr extends control
     }
 
     /**
-     * Add a Bug for this review.
+     * Add a review for this review.
      *
      * @param  int    $repoID
-     * @param  string $file
+     * @param  int    $mr
      * @param  int    $v1
      * @param  int    $v2
      * @access public
      * @return void
      */
-    public function addBug($repoID, $file, $v1, $v2)
+    public function addReview($repoID, $mr, $v1, $v2)
     {
         /* Handle the exception that when $repoID is empty. */
         if($repoID == "0") $this->send(array());
 
         $this->loadModel('repo');
-        if($this->get->repoPath) $file = $this->get->repoPath;
         if(!empty($_POST))
         {
-            $result = $this->mr->saveBug($repoID, $file, $v1, $v2);
+            if($this->post->reviewType == 'bug')  $result = $this->mr->saveBug($repoID, $mr, $v1, $v2);
+            if($this->post->reviewType == 'task') $result = $this->mr->saveTask($repoID, $mr, $v1, $v2);
             if(dao::isError()) die(json_encode($result));
 
-            $bugID    = $result['id'];
+            $objectID = $result['id'];
             $repo     = $this->repo->getRepoById($repoID);
             /* Handle the exception that when $repo is empty. */
-            if(empty($repo)) $this->send(array());
+            if(empty($repo) or empty($result)) $this->send(json_encode(array()));
 
-            $entry    = isset($repo->name) ? $repo->name . '/' . $this->repo->decodePath($file) : '';
-            $location = sprintf($this->lang->repo->reviewLocation, $entry, $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2, $this->post->begin, $this->post->end);
-            if(empty($v1))
-            {
-                $revision = $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2;
-                $link = $this->repo->createLink('view', "repoID=$repoID&objectID=0&entry={$file}&revision=$v2&showBug=true") . '#L' . $this->post->begin;
-            }
-            else
-            {
-                $revision  = $repo->SCM != 'Subversion' ? substr($v1, 0, 10) : $v1;
-                $revision .= ' : ';
-                $revision .= $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2;
-                $link = $this->repo->createLink('diff', "repoID=$repoID&objectID=0&entry={$file}&oldRevision=$v1&newRevision=$v2&showBug=true") . '#L' . $this->post->begin;
-            }
+            $location = sprintf($this->lang->repo->reviewLocation, $this->post->entry ? base64_decode($this->post->entry) : '', $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2, $this->post->begin, $this->post->end);
+            $link     = $this->createLink('mr', 'diff', "mr=$mr") . '#L' . $this->post->begin;
 
-            $actionID = $this->loadModel('action')->create('bug', $bugID, 'repoCreated', '', html::a($link, $location));
-            $this->loadModel('mail')->sendmail($bugID, $actionID);
+            $actionID = $this->loadModel('action')->create($this->post->reviewType, $objectID, 'repoCreated', '', html::a($link, $location));
+            $this->loadModel('mail')->sendmail($objectID, $actionID);
 
             echo json_encode($result);
         }
diff --git a/module/mr/css/common.css b/module/mr/css/common.css
index a2da70383a..488645d71d 100644
--- a/module/mr/css/common.css
+++ b/module/mr/css/common.css
@@ -88,8 +88,8 @@ h3 {font-size: 16px;}
 
 /* repo action form */
 .repoCode .comment-list, .repoCode .comment-actions {max-width: 900px;}
-.repoCode .bugFormContainer {border: 1px solid #bbb; margin: 0 0 0 15px; padding: 10px 20px 10px 10px; max-width: 880px; background: #fff;}
-.repoCode .bugFormContainer th {width: 70px;}
+.repoCode .reviewFormContainer {border: 1px solid #bbb; margin: 0 0 0 15px; padding: 10px 20px 10px 10px; max-width: 880px; background: #fff;}
+.repoCode .reviewFormContainer th {width: 70px;}
 
 .repoCode .action-row {display: none;}
 .repoCode .with-action-row .action-row {display: table-row;}
@@ -106,26 +106,26 @@ h3 {font-size: 16px;}
 .repoCode .comment-cell .panel-body {padding: 6px 10px;}
 .repoCode .comment-cell .panel-actions.pull-right {margin-right: 0; margin-top: 0;}
 .repoCode .comment-cell .editing .panel-body, .repoCode .comment-cell .commentContainer.show-form .panel-body {display: none;}
-.repoCode .comment-cell .bug-edit-form,  {padding: 10px; display: none;}
-.repoCode .comment-cell .editing .bug-edit-form, .repoCode .comment-cell .commentContainer.show-form .comment-edit-form {display: block;}
+.repoCode .comment-cell .review-edit-form,  {padding: 10px; display: none;}
+.repoCode .comment-cell .editing .review-edit-form, .repoCode .comment-cell .commentContainer.show-form .comment-edit-form {display: block;}
 
 .repoCode .comment {border: 1px solid #e5e5e5; background: #fafafa; padding: 5px 10px; margin-bottom: 10px;}
 .repoCode .comment .comment-edit-form {margin-top: 10px;}
-.repoCode .panel-bug .steps {background: #f1f1f1; padding: 5px 10px;}
-.repoCode .panel-bug .bug-edit-form {margin-bottom: 10px;}
-.repoCode .panel-bug .panel-body {display: none;}
-.repoCode .panel-bug .panel-heading {cursor: pointer;}
-.repoCode .panel-bug.show .panel-body {display: block;}
-.repoCode .panel-bug.show .icon-chevron-sign-down:before {content: '\e711';}
-.repoCode .panel-bug.show-edit-form .bug-edit-form,
-.repoCode .panel-bug.show-form .commentForm,
+.repoCode .panel-review .steps {background: #f1f1f1; padding: 5px 10px;}
+.repoCode .panel-review .review-edit-form {margin-bottom: 10px;}
+.repoCode .panel-review .panel-body {display: none;}
+.repoCode .panel-review .panel-heading {cursor: pointer;}
+.repoCode .panel-review.show .panel-body {display: block;}
+.repoCode .panel-review.show .icon-chevron-sign-down:before {content: '\e711';}
+.repoCode .panel-review.show-edit-form .review-edit-form,
+.repoCode .panel-review.show-form .commentForm,
 .repoCode .comment.show-form .comment-edit-form {display: block;}
-.repoCode .panel-bug .bug-edit-form,
-.repoCode .panel-bug.show-form .addComment,
-.repoCode .panel-bug .commentForm,
+.repoCode .panel-review .review-edit-form,
+.repoCode .panel-review.show-form .addComment,
+.repoCode .panel-review .commentForm,
 .repoCode .comment .comment-edit-form,
-.repoCode .panel-bug.show-edit-form .panel-body .title,
-.repoCode .panel-bug.show-edit-form .bug-date,
+.repoCode .panel-review.show-edit-form .panel-body .title,
+.repoCode .panel-review.show-edit-form .bug-date,
 .repoCode .comment.show-form .comment-content, .repoCode .comment.show-form .comment-date {display: none;}
 
 .repoCode .text-content {white-space: normal; white-space: pre-line;}
@@ -154,8 +154,8 @@ h3 {font-size: 16px;}
 .repoCode #diff tr.commented .row-tip {right: 0;}
 .repoCode #diff tr.commented .icon-chat-dot {left: 0;}
 
-.repoCode .panel, .bugFormContainer {transition: border 0.4s;}
-.repoCode .panel.highlight, #bugForm.highlight .bugFormContainer {border-color: #e48600;}
+.repoCode .panel, .reviewFormContainer {transition: border 0.4s;}
+.repoCode .panel.highlight, #reviewForm.highlight .reviewFormContainer {border-color: #e48600;}
 
 #bugsPreview {white-space: normal;}
 #bugsPreview .dropdown-menu {top: -100%; left: 30%; padding-top: 0; min-width: 300px; max-width: 500px;}
@@ -166,7 +166,7 @@ h3 {font-size: 16px;}
 .icon-comments {position: relative; left: -50px;}
 
 /* bug form */
-#bugForm, #bugForm table {margin: 0; padding: 0;}
+#reviewForm, #reviewForm table {margin: 0; padding: 0;}
 
 .panel .table + .panel-footer {border-top: 0; background: #fff;}
 
diff --git a/module/mr/js/diff.js b/module/mr/js/diff.js
index a076f1628f..b0ab2c451a 100644
--- a/module/mr/js/diff.js
+++ b/module/mr/js/diff.js
@@ -15,8 +15,8 @@ $(document).ready(function()
 {
     var $diffCode = $('.diff');
     var hidePreview;
-    var $bugsPreview = $('#bugsPreview');
-    var $bugsPreviewMenu = $('#bugsPreview').children('.dropdown-menu');
+    var $reviewsPreview = $('#reviewsPreview');
+    var $reviewsPreviewMenu = $('#reviewsPreview').children('.dropdown-menu');
     var $rows = $diffCode.find('tr');
     var rowTip = $('#rowTip').html();
     var lastLine;
@@ -49,12 +49,10 @@ $(document).ready(function()
     });
 
     var isInline = $.cookie('arrange') == 'inline';
-    var $bugFormRow = $('<tr class="action-row"><th></th>' + (isInline ? '<th></th><td class="action-cell"></td>' : '<td colspan="3" class="action-cell"></td>') + '</tr>');
-    var $bugForm = $('#bugForm');
-    var $commentCell = $('#commentCell');
-    var $bugPanel = $('#bugPanel');
-//    $bugForm.find('input[name="begin"], input[name="end"]').attr('max', lastLine);
-    $bugFormRow.find('td').append($bugForm.removeClass('hide'));
+    var $reviewFormRow = $('<tr class="action-row"><th></th>' + (isInline ? '<th></th><td class="action-cell"></td>' : '<td colspan="3" class="action-cell"></td>') + '</tr>');
+    var $reviewForm = $('#reviewForm');
+    var $reviewPanel = $('#reviewPanel');
+    $reviewFormRow.find('td').append($reviewForm.removeClass('hide'));
 
     var highlight = function($e)
     {
@@ -62,76 +60,48 @@ $(document).ready(function()
         $e.addClass('highlight');
     };
 
-    var createComment = function(comment, $comments)
-    {
-        console.log();
-        var $comment = $commentCell.clone()
-            .removeClass('hide')
-            .attr('id', 'comment-' + comment.id)
-            .attr('data-comment', comment.id);
-        $comment.find('.realname').text(comment.realname);
-        $comment.find('.comment-content').text(comment.comment);
-        $comment.find('.date').text(comment.date);
-        $comment.find('.edit').toggle(comment.edit);
-        $comment.find('.comment-edit-form').attr('action', createLink('repo', 'editComment', 'commentID=' + comment.id));
-
-        if($comments)
-        {
-            if(typeof $comments !== 'object') $comments = $('#bug-' + $comments + ' .comments');
-            ($comments.hasClass('comments') ? $comments : $comments.find('.comments')).append($comment);
-        }
-
-        return $comment;
-    };
-
-    var createBug = function(bug, line, $commentRow, show)
+    var createReview = function(review, line, show)
     {
         var commentCount, j;
-        var $bug = $bugPanel.clone().removeClass('hide').attr('id', 'bug-' + bug.id).attr('data-bug', bug.id);
-        $bug.find('.bugid').text(bug.id);
-        $bug.find('.realname').text(bug.realname);
-        $bug.find('.openedDate').text(bug.openedDate);
-        $bug.find('.title').text(bug.title);
-        $bug.find('.steps').toggle(bug.steps != '').html(bug.steps);
-        $bug.find('.edit').toggle(bug.edit);
-        $bug.find('.code-lines').text(bug.lines);
-        $bug.find('.delete').toggle(bug.delete);
-        $bug.find('input[name="objectID"]').val(bug.id);
-        $bug.find('.bug-edit-form').attr('action', createLink('repo', 'editBug', 'bugID=' + bug.id));
-        $bug.find('a.view-bug').attr('href', createLink('bug', 'view', "bugID=" + bug.id));
-        $bug.data('data', bug);
-        $bug.toggleClass('show', show > 1);
-        if(show > 2) highlight($bug);
+        var $review = $reviewPanel.clone().removeClass('hide').attr('id', review.objectType + '-' + review.id);
+        $review.find('.realname').text(review.realname);
+        $review.find('.openedDate').text(review.openedDate);
+        $review.find('.title').text(review.title);
+        $review.find('.content').toggle(review.content != '').html(review.content);
+        $review.find('.code-lines').text(review.lines);
+        $review.find('input[name="objectID"]').val(review.id);
+        $review.data(review);
 
-        if(bug.comments)
-        {
-            commentCount = bug.comments.length;
-            $bugComments = $bug.find('.comments');
-            for(j = 0; j < commentCount; j++)
-            {
-                createComment(bug.comments[j], $bugComments);
-            }
-        }
+        id  = review.objectType == 'bug' ? 'Bug' : 'Task';
+        id += '#' + review.id;
+        if(review.view) id = "<a href='" + createLink(review.objectType, 'view', 'id=' + review.id) +  "'>" + id + "</a>";
+        $review.find('.title').closest('.panel-heading').find('.panel-actions').prepend(id);
+        if(!review.delete) $review.find('.title').closest('.panel-heading').find('.panel-actions .reviewDelete').hide();
 
-        if(!line && bug.line) line = bug.line;
+        $review.toggleClass('show', show > 1);
+        if(show > 2) highlight($review);
+
+        if(!line && review.line) line = review.line;
         if(line)
         {
-            if(!$commentRow)
+            var $row = $rows.filter('[data-line="' + line + '"]').last();
+            if(review.entry) $row = $('#diff[data-entry="' + review.entry + '"]').find('tr').filter('[data-line="' + line + '"]');
+            if($row.length == 0) return false;
+
+            $commentRow = $row.next('tr');
+            if($row.hasClass('commented')) $commentRow = $row.nextAll('tr.comment-row').first();
+            if(!$commentRow.hasClass('comment-row'))
             {
-                var $row = $rows.filter('[data-line="' + line + '"]').last();
-                $commentRow = $row.next('tr');
-                if(!$commentRow.hasClass('comment-row'))
-                {
-                    $commentRow = $('<tr class="comment-row"><th></th>' + (isInline ? '<th></th><td class="comment-cell"><div class="comment-list"></div></td>' : '<td colspan="3" class="comment-cell"><div class="comment-list"></div></td>') + '</tr>');
-                    $row.addClass('commented').after($commentRow);
-                }
+                $commentRow = $('<tr class="comment-row"><th></th>' + (isInline ? '<th></th><td class="comment-cell"><div class="comment-list"></div></td>' : '<td colspan="3" class="comment-cell"><div class="comment-list"></div></td>') + '</tr>');
+                $row.addClass('commented').after($commentRow);
             }
-            ($commentRow.hasClass('comment-list') ? $commentRow : $commentRow.find('.comment-list')).append($bug);
+
+            $commentRow.find('.comment-list').append($review);
 
             if(show && $commentRow.hasClass('comment-row')) $commentRow.addClass('show');
         }
 
-        return $bug;
+        return $review;
     };
 
     var toggleComment = function($row, show)
@@ -182,233 +152,50 @@ $(document).ready(function()
                 $rows.removeClass('with-action-row')
                 $row.addClass('with-action-row');
 
-                $bugForm.find('input[name="begin"]').val(line);
-                $bugForm.find('input[name="end"]').attr('min', line).val(line);
-                $bugForm.find('select#assignedTo').val(blamePairs[line]);
-                $bugForm.find('select#assignedTo').trigger("chosen:updated");
+                $reviewForm.find('input[name="begin"]').val(line);
+                $reviewForm.find('input[name="end"]').attr('min', line).val(line);
+                $reviewForm.find('select#assignedTo').trigger("chosen:updated");
+                $reviewForm.find('input#entry').val($row.closest('table#diff').data('entry'));
 
-                $row.after($bugFormRow);
+                $row.after($reviewFormRow);
 
                 KindEditor.remove('#commentText');
                 $('#commentText').kindeditor();
-
-                var getCommiterLink = createLink('repo', 'ajaxgetcommitter', 'repoID=' + repoID + "&entry=" + file + "&revision=" + revision + "&line=" + line);
-                var connector = getCommiterLink.indexOf('&') >= 0 ? '&' : '?';
-                getCommiterLink = getCommiterLink + connector + 'entry=' + file;
-                $.ajax({url: getCommiterLink}).done(function(responseText)
-                {
-                    $bugForm.find('#assignedTo').val(responseText).trigger("chosen:updated");
-                });
             }
-            highlight($bugForm);
-            $bugForm.find('input[name="title"]').focus();
+            highlight($reviewForm);
+            $reviewForm.find('input[name="title"]').focus();
             $row.addClass('selected');
         }
         e.stopPropagation();
-    }).on('click', '.bugCancel', function()
+    }).on('click', '.reviewDelete', function(e)
     {
-        $rows.removeClass('selected');
-        $diffCode.removeClass('with-action-row');
-    }).on('click', '.bugEdit', function(e)
-    {
-        var $panelBug = $(this).closest('.panel-bug');
+        var $review = $(this).closest('.panel-review');
+        if(!$review.length) return;
 
-        if($panelBug.hasClass('show-edit-form'))
+        if(confirm(confirmDelete))
         {
-            $panelBug.removeClass('show-edit-form');
-            e.stopPropagation();
-            return;
-        }
-
-        $panelBug.addClass('show show-edit-form').find('input[name="commentText"]').val($panelBug.find('.title').first().text()).focus();
-        e.stopPropagation();
-        return false;
-    }).on('submit', '.bug-edit-form', function()
-    {
-        var $form = $(this);
-        $(this).ajaxSubmit(
-        {
-            success:function(text)
-            {
-                var $bug = $form.closest('.panel-bug');
-                $bug.find('.title').text(text);
-                $bug.removeClass('show-edit-form');
-            },
-            beforeSubmit:function(formData, jqForm)
-            {
-                var form = jqForm[0];
-                if(!form.commentText.value)
-                {
-                    alert(contentError);
-                    return false;
-                }
-            }
-        });
-        return false;
-    }).on('click', '.bugEditCancel', function()
-    {
-        $(this).closest('.panel-bug').removeClass('show-edit-form');
-    }).on('click', '.bugDelete', function(e)
-    {
-        var $bug = $(this).closest('.panel-bug');
-        if(!$bug.length) return;
-
-        if(confirm(confirmDelete)) 
-        {
-            var link  = createLink('repo', 'deleteBug', 'bugID=' + $bug.data('bug') + '&confirm=yes');
+            var link  = createLink($review.data('objectType'), 'delete', 'id=' + $review.data('id') + '&confirm=yes');
             $.get(link, function(data)
             {
-                if(data == 'deleted') 
+                var $commentRow = $review.closest('.comment-row');
+                if($commentRow.find('.panel-review').length === 1)
                 {
-                    var $commentRow = $bug.closest('.comment-row');
-                    if($commentRow.find('.panel-bug').length === 1)
-                    {
-                        $commentRow.removeClass('show').prev('tr').removeClass('commented');
-                    }
-                    $bug.remove();
+                    $commentRow.removeClass('show').prev('tr').removeClass('commented');
                 }
+                $review.remove();
             });
         }
         e.stopPropagation();
         return false;
-    }).on('click', '.addComment', function()
-    {
-        $(this).closest('.panel-bug').addClass('show-form').find('.commentForm textarea').focus();
-    }).on('click', '.commentCancel', function()
-    {
-        $(this).closest('.panel-bug').removeClass('show-form');
-    }).on('submit', '.commentForm', function()
-    {
-        var $form = $(this);
-        $form.ajaxSubmit(
-        {
-            success:function(json)
-            {
-                var $panelBug = $form.closest('.panel-bug');
-                $form.find('textarea').val('');
-                $panelBug.removeClass('show-form');
-                createComment($.parseJSON(json), $panelBug.data('bug'));
-            },
-            beforeSubmit:function(formData, jqForm)
-            {
-                var form = jqForm[0];
-                if(!form.comment.value)
-                {
-                    alert(commentError);
-                    return false;
-                }
-            }
-        });
-        return false;
-    }).on('click', '.commentEdit', function()
-    {
-        var $comment = $(this).closest('.comment');
-
-        if($comment.hasClass('show-form'))
-        {
-            $comment.removeClass('show-form');
-            return;
-        }
-        $comment.addClass('show-form').find('textarea').val($comment.find('.comment-content').text()).focus();
-    }).on('click', '.commentEditCancel', function()
-    {
-        $(this).closest('.comment').removeClass('show-form');
-    }).on('submit', '.comment-edit-form', function()
-    {
-        var $form = $(this);
-        $form.ajaxSubmit(
-        {
-            success:function(html)
-            {
-                var $comment = $form.closest('.comment');
-                $comment.find('.comment-content').html(html);
-                $comment.removeClass('show-form');
-            },
-            beforeSubmit:function(formData, jqForm)
-            {
-                var form = jqForm[0];
-                if(!form.commentText.value)
-                {
-                    alert(contentError);
-                    return false;
-                }
-            }
-        });
-        return false;
-    }).on('click', '.commentDelete', function()
-    {
-        var $container = $(this).closest('.commentContainer');
-        if(!$container.length) return;
-
-        if(confirm(confirmDeleteComment)) 
-        {
-            var commentID = $container.data('comment');
-            var link      = createLink('repo', 'deleteComment', 'commentID=' + commentID + '&confirm=yes');
-
-            $.get(link, function(data)
-            {
-                if(data == 'deleted')
-                {
-                    var $commentRow = $container.closest('.comment-row');
-                    if($commentRow.find('.bugContainer, .commentContainer').length === 1)
-                    {
-                        $commentRow.removeClass('show').prev('tr').removeClass('commented');
-                    }
-                    $container.remove();
-                }
-            });
-        }
-        return false;
     }).on('click', 'tr.commented', function()
     {
         toggleComment($(this));
-    }).on('click', '.panel-bug > .panel-heading', function()
+    }).on('click', '.panel-review > .panel-heading', function()
     {
-        $(this).closest('.panel-bug').toggleClass('show');
-    }).on('mouseenter', 'tr.commented td .preview-icon', function(e)
-    {
-        var $cell = $(this).closest('td');
-        var $row = $cell.closest('tr');
-        var $commentRow = $row.next('tr');
-
-        var $bugs = $commentRow.find('.panel-bug'), line = '?';
-        $bugsPreviewMenu.children('li:not(.dropdown-header)').remove();
-        $bugsPreviewMenu.find('.bug-count').text($bugs.length);
-        $bugsPreviewMenu.find('.comment-count').text($commentRow.find('.comment').length);
-        $bugs.each(function()
-        {
-            var bug = $(this).data('data');
-            line = bug.line;
-            $bugsPreviewMenu.append('<li><a href="javascript:;" data-id="#bug-' + bug.id + '"><small class="text-muted">#' + bug.id + '</small> ' + bug.title + '</a></li>');
-        });
-        $bugsPreviewMenu.find('.code-line').text(line);
-
-        $bugsPreview.prependTo($cell);
-        clearTimeout(hidePreview);
-        $bugsPreviewMenu.css({top: 0-$bugsPreviewMenu.outerHeight(), left: Math.max(0, e.offsetX-$bugsPreviewMenu.outerWidth())}).addClass('show');
-        setTimeout(function(){$bugsPreviewMenu.addClass('in');}, 50);
-    }).on('mouseleave', 'tr.commented td', function()
-    {
-        $bugsPreviewMenu.removeClass('in');
-        hidePreview = setTimeout(function(){$bugsPreviewMenu.removeClass('show');}, 200);
+        $(this).closest('.panel-review').toggleClass('show');
     });
 
-    $bugsPreviewMenu.on('click', 'li', function(e)
-    {
-        var $bug = $($(this).find('a').data('id'));
-        if($bug.length)
-        {
-            $bug.addClass('show');
-            toggleComment($bug.closest('tr.comment-row'), true);
-            highlight($bug);
-
-            $bugsPreviewMenu.removeClass('in');
-            hidePreview = setTimeout(function(){$bugsPreviewMenu.removeClass('show');}, 200);
-        }
-        e.stopPropagation();
-    });
-
-    $bugForm.submit(function()
+    $reviewForm.submit(function()
     {
         $(this).ajaxSubmit(
         {
@@ -417,20 +204,42 @@ $(document).ready(function()
                 json = $.parseJSON(json);
                 if(json.result == 'fail')
                 {
-                   alert(json.message);
-                   return false;
+                    var message = '';
+                    if(typeof(json.message) != 'string')
+                    {
+                        for(i in json.message)
+                        {
+                            if(typeof(json.message[i]) == 'string')
+                            {
+                                message += json.message[i] + '\n';
+                            }
+                            else
+                            {
+                                for(j in json.message[i])
+                                {
+                                    message += json.message[i][j] + '\n';
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        message += json.message + '\n';
+                    }
+                    alert(message);
+                    return false;
                 }
 
-                createBug(json, null, null, 3);
+                createReview(json, json.line, 3);
                 $diffCode.removeClass('with-action-row');
                 $diffCode.find('tr.with-action-row.selected').removeClass('selected');
-                $bugForm.find('#title').val('');
+                $reviewForm.find('#title').val('');
                 KindEditor.html('#commentText', '');
             },
             beforeSubmit:function(formData, jqForm)
             {
                 var form = jqForm[0];
-                if(!form.product.value) 
+                if(!form.product.value)
                 {
                     alert(productError);
                     return false;
@@ -438,7 +247,7 @@ $(document).ready(function()
                 if(!form.title.value)
                 {
                     alert(titleError);
-                    $bugForm.find('input[name="title"]').focus();
+                    $reviewForm.find('input[name="title"]').focus();
                     return false;
                 }
             }
@@ -447,27 +256,22 @@ $(document).ready(function()
     }).on('change', 'input[name="begin"]', function()
     {
         var begin = $(this).val();
-        var $end = $bugForm.find('input[name="end"]').attr('min', begin);
+        var $end = $reviewForm.find('input[name="end"]').attr('min', begin);
         if(parseInt($end.val()) < parseInt(begin))
         {
             $end.val(begin);
         }
     });
 
-    if(bugs)
+    if(reviews)
     {
-        var lineBugs, bugsCount, i;
-        for(var line in bugs)
+        var lineReviews;
+        for(var line in reviews)
         {
             if(line)
-            { 
-                lineBugs = bugs[line];
-                bugsCount = lineBugs.length;
-
-                for(i = 0; i < bugsCount; i++)
-                {
-                    createBug(lineBugs[i], line);
-                }
+            {
+                lineReviews = reviews[line];
+                for(var i in lineReviews) createReview(lineReviews[i], line);
             }
         }
     }
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 4598f1d2de..c5c87e9a91 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -21,7 +21,7 @@ $lang->mr->linkStory = '关联需求';
 $lang->mr->linkBug   = '关联Bug';
 $lang->mr->linkTask  = '关联任务';
 $lang->mr->unlink    = '取消关联需求、Bug、任务';
-$lang->mr->addBug    = '添加评审';
+$lang->mr->addReview = '添加评审';
 
 $lang->mr->id          = 'ID';
 $lang->mr->mriid       = "MR原始ID";
@@ -46,6 +46,11 @@ $lang->mr->reject   = '拒绝';
 $lang->mr->close    = '关闭';
 $lang->mr->reopen   = '重新打开';
 
+$lang->mr->reviewType = '评审类型';
+$lang->mr->reviewTypeList = array();
+$lang->mr->reviewTypeList['bug']  = 'Bug';
+$lang->mr->reviewTypeList['task'] = '任务';
+
 $lang->mr->approvalResult = '评审意见';
 $lang->mr->approvalResultList = array();
 $lang->mr->approvalResultList['approve'] = '通过';
diff --git a/module/mr/model.php b/module/mr/model.php
index 5ff5ec1588..43a9f97221 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -549,7 +549,7 @@ class mrModel extends model
     public function getDiffs($MR, $encoding = '')
     {
         $diffVersions = $this->apiGetDiffVersions($MR->gitlabID, $MR->targetProject, $MR->mriid);
-        $gitlab = $this->gitlab->getByID($MR->gitlabID);
+        $gitlab       = $this->gitlab->getByID($MR->gitlabID);
 
         $this->loadModel('repo');
         $repo = new stdclass;
@@ -567,7 +567,7 @@ class mrModel extends model
         foreach ($diffVersions as $diffVersion)
         {
             $singleDiff = $this->apiGetSingleDiffVersion($MR->gitlabID, $MR->targetProject, $MR->mriid, $diffVersion->id);
-            if ($singleDiff->state == 'empty') continue;
+            if($singleDiff->state == 'empty') continue;
             $commits = $singleDiff->commits;
             $diffs   = $singleDiff->diffs;
             foreach ($diffs as $index => $diff)
@@ -583,9 +583,10 @@ class mrModel extends model
                 $lines[] = sprintf("--a/%s", $diff->old_path);
                 $lines[] = sprintf("--b/%s", $diff->new_path);
                 $diffLines = explode("\n", $diff->diff);
-                foreach ($diffLines as $diffLine) $lines[] = $diffLine;
+                foreach($diffLines as $diffLine) $lines[] = $diffLine;
             }
         }
+
         $scm = $this->app->loadClass('scm');
         $scm->setEngine($repo);
         $diff = $scm->engine->parseDiff($lines);
@@ -782,45 +783,46 @@ class mrModel extends model
      * Get review.
      *
      * @param  int    $repoID
-     * @param  string $entry
+     * @param  int    $MRID
      * @param  string $revision
      * @access public
      * @return array
      */
-    public function getReview($repoID, $entry, $revision)
+    public function getReview($repoID, $MRID, $revision = '')
     {
         $reviews = array();
         $bugs    = $this->dao->select('t1.*, t2.realname')->from(TABLE_BUG)->alias('t1')
-            ->leftJoin(TABLE_USER)->alias('t2')
-            ->on('t1.openedBy = t2.account')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.openedBy = t2.account')
             ->where('t1.repo')->eq($repoID)
-            ->andWhere('t1.entry')->eq($entry)
-            ->andWhere('t1.v2')->eq($revision)
+            ->andWhere('t1.mr')->eq($MRID)
+            ->beginIF($revision)->andWhere('t1.v2')->eq($revision)->fi()
             ->andWhere('t1.deleted')->eq(0)
             ->fetchAll('id');
-        $comments = $this->dao->select('t1.*, t2.realname')->from(TABLE_ACTION)->alias('t1')
-            ->leftJoin(TABLE_USER)->alias('t2')
-            ->on('t1.actor = t2.account')
-            ->where('t1.objectType')->eq('bug')
-            ->andWhere('t1.objectID')->in(array_keys($bugs))
-            ->andWhere('t1.action')->eq('commented')
-            ->fetchGroup('objectID', 'id');
         foreach($bugs as $bug)
         {
             if(common::hasPriv('bug', 'edit'))   $bug->edit   = true;
             if(common::hasPriv('bug', 'delete')) $bug->delete = true;
+            if(common::hasPriv('bug', 'view'))   $bug->view   = true;
             $lines = explode(',', trim($bug->lines, ','));
             $line  = $lines[0];
-            $reviews[$line]['bugs'][$bug->id] = $bug;
+            $reviews[$line]['bug'][$bug->id] = $bug;
+        }
 
-            if(isset($comments[$bug->id]))
-            {
-                foreach($comments[$bug->id] as $key => $comment)
-                {
-                    if($comment->actor == $this->app->user->account) $comment->edit = true;
-                }
-                $reviews[$line]['comments'] = $comments;
-            }
+        $tasks = $this->dao->select('t1.*, t2.realname')->from(TABLE_TASK)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.openedBy = t2.account')
+            ->where('t1.repo')->eq($repoID)
+            ->andWhere('t1.mr')->eq($MRID)
+            ->beginIF($revision)->andWhere('t1.v2')->eq($revision)->fi()
+            ->andWhere('t1.deleted')->eq(0)
+            ->fetchAll('id');
+        foreach($tasks as $task)
+        {
+            if(common::hasPriv('task', 'edit'))   $task->edit   = true;
+            if(common::hasPriv('task', 'delete')) $task->delete = true;
+            if(common::hasPriv('task', 'view'))   $task->view   = true;
+            $lines = explode(',', trim($task->lines, ','));
+            $line  = $lines[0];
+            $reviews[$line]['task'][$task->id] = $task;
         }
 
         return $reviews;
@@ -878,43 +880,154 @@ class mrModel extends model
      * Save bug.
      *
      * @param  int    $repoID
-     * @param  string $file
+     * @param  int    $mr
      * @param  int    $v1
      * @param  int    $v2
      * @access public
      * @return array
      */
-    public function saveBug($repoID, $file, $v1, $v2)
+    public function saveBug($repoID, $mr, $v1, $v2)
     {
         $now  = helper::now();
         $data = fixer::input('post')
-            ->add('severity', 3)
+            ->stripTags('commentText', $this->config->allowedTags)
+            ->add('pri', 2)
+            ->add('severity', 2)
             ->add('openedBy', $this->app->user->account)
             ->add('openedDate', $now)
             ->add('openedBuild', 'trunk')
-            ->add('assignedDate', $now)
             ->add('type', 'codeimprovement')
             ->add('repo', $repoID)
-            ->add('entry', $file)
+            ->add('mr', $mr)
             ->add('lines', $this->post->begin . ',' . $this->post->end)
             ->add('v1', $v1)
             ->add('v2', $v2)
-            ->remove('commentText,begin,end,uid')
+            ->cleanInt('module,execution,mr,repo')
+            ->remove('begin,end,uid,reviewType,taskExecution,taskModule,taskAssignedTo')
             ->get();
 
-        $data->steps = $this->loadModel('file')->pasteImage($this->post->commentText, $this->post->uid);
-        $this->dao->insert(TABLE_BUG)->data($data)->exec();
+        $data->steps  = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
+        if($data->assignedTo) $data->assignedDate = $now;
+        unset($data->commentText);
+
+        $this->loadModel('bug');
+        foreach(explode(',', $this->config->bug->create->requiredFields) as $requiredField)
+        {
+            $requiredField = trim($requiredField);
+            if(empty($requiredField)) continue;
+            if(!isset($data->$requiredField)) continue;
+            if(empty($data->$requiredField))
+            {
+                $fieldName = $requiredField;
+                if(isset($this->lang->bug->$requiredField)) $fieldName = $this->lang->bug->$requiredField;
+                dao::$errors[] = sprintf($this->lang->error->notempty, $fieldName);
+            }
+        }
+        if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
+
+        $this->dao->insert(TABLE_BUG)->data($data)->autocheck()->exec();
 
         if(!dao::isError())
         {
             $bugID = $this->dao->lastInsertID();
-            $this->file->updateObjectID($this->post->uid, $bugID, 'bug');
+            $this->loadModel('file')->updateObjectID($this->post->uid, $bugID, 'bug');
             setcookie("repoPairs[$repoID]", $data->product);
 
-            return array('result' => 'success', 'id' => $bugID, 'realname' => $this->app->user->realname, 'openedDate' => substr($now, 5, 11), 'edit' => true, 'delete' => true, 'lines' => $data->lines, 'line' => $this->post->begin, 'steps' => $data->steps, 'title' => $data->title);
+            $bugInfo = array();
+            $bugInfo['result']     = 'success';
+            $bugInfo['id']         = $bugID;
+            $bugInfo['realname']   = $this->app->user->realname;
+            $bugInfo['openedDate'] = substr($now, 5, 11);
+            $bugInfo['edit']       = common::hasPriv('bug', 'edit');
+            $bugInfo['view']       = common::hasPriv('bug', 'view');
+            $bugInfo['delete']     = common::hasPriv('bug', 'delete');
+            $bugInfo['lines']      = $data->lines;
+            $bugInfo['line']       = $this->post->begin;
+            $bugInfo['content']    = $data->steps;
+            $bugInfo['title']      = $data->title;
+            $bugInfo['objectType'] = 'bug';
+            $bugInfo['entry']      = $data->entry;
+            return $bugInfo;
         }
 
-        return array('result' => 'fail', 'message' => join("\n", dao::getError()));
+        return array('result' => 'fail', 'message' => dao::getError());
+    }
+
+    /**
+     * Save task.
+     *
+     * @param  int    $repoID
+     * @param  int    $mr
+     * @param  int    $v1
+     * @param  int    $v2
+     * @access public
+     * @return array
+     */
+    public function saveTask($repoID, $mr, $v1, $v2)
+    {
+        $now  = helper::now();
+        $data = fixer::input('post')->stripTags('commentText', $this->config->allowedTags)->get();
+
+        $task = new stdclass();
+        $task->execution  = (int)$data->taskExecution;
+        $task->project    = (int)$this->dao->select('project')->from(TABLE_PROJECT)->where('id')->eq($task->execution)->fetch('project');
+        $task->module     = (int)$data->taskModule;
+        $task->name       = $data->title;
+        $task->type       = 'devel';
+        $task->pri        = '2';
+        $task->status     = 'wait';
+        $task->version    = '1';
+        $task->openedBy   = $this->app->user->account;
+        $task->assignedTo = $data->taskAssignedTo;
+        $task->repo       = (int)$repoID;
+        $task->mr         = (int)$mr;
+        $task->lines      = $this->post->begin . ',' . $this->post->end;
+        $task->entry      = $data->entry;
+        $task->v1         = $v1;
+        $task->v2         = $v2;
+        $task->desc       = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
+        if($task->assignedTo) $task->assignedDate = $now;
+
+        $this->loadModel('task');
+        foreach(explode(',', $this->config->task->create->requiredFields) as $requiredField)
+        {
+            $requiredField = trim($requiredField);
+            if(empty($requiredField)) continue;
+            if(!isset($task->$requiredField)) continue;
+            if(empty($task->$requiredField))
+            {
+                $fieldName = $requiredField;
+                if(isset($this->lang->task->$requiredField)) $fieldName = $this->lang->task->$requiredField;
+                dao::$errors[] = sprintf($this->lang->error->notempty, $fieldName);
+            }
+        }
+        if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
+
+        $this->dao->insert(TABLE_TASK)->data($task)->autocheck()->exec();
+
+        if(!dao::isError())
+        {
+            $taskID = $this->dao->lastInsertID();
+            $this->file->updateObjectID($this->post->uid, $taskID, 'task');
+
+            $taskInfo = array();
+            $taskInfo['result']     = 'success';
+            $taskInfo['id']         = $taskID;
+            $taskInfo['realname']   = $this->app->user->realname;
+            $taskInfo['openedDate'] = substr($now, 5, 11);
+            $taskInfo['edit']       = common::hasPriv('task', 'edit');
+            $taskInfo['view']       = common::hasPriv('task', 'view');
+            $taskInfo['delete']     = common::hasPriv('task', 'delete');
+            $taskInfo['lines']      = $data->lines;
+            $taskInfo['line']       = $this->post->begin;
+            $taskInfo['content']    = $task->desc;
+            $taskInfo['title']      = $data->title;
+            $taskInfo['objectType'] = 'task';
+            $taskInfo['entry']      = $task->entry;
+            return $taskInfo;
+        }
+
+        return array('result' => 'fail', 'message' => dao::getError());
     }
 
     /**
@@ -960,13 +1073,17 @@ class mrModel extends model
     /**
      * Get last review info.
      *
-     * @param  string $entry
+     * @param  int    $repoID
      * @access public
      * @return object
      */
-    public function getLastReviewInfo($entry)
+    public function getLastReviewInfo($repoID)
     {
-        return $this->dao->select('*')->from(TABLE_BUG)->where('entry')->eq($entry)->orderby('id_desc')->fetch();
+        $lastReview = new stdclass();
+        $lastReview->bug  = $this->dao->select('*')->from(TABLE_BUG)->where('repo')->eq($repoID)->orderby('id_desc')->fetch();
+        $lastReview->task = $this->dao->select('*')->from(TABLE_TASK)->where('repo')->eq($repoID)->orderby('id_desc')->fetch();
+
+        return $lastReview;
     }
 
     /**
diff --git a/module/mr/view/diff.html.php b/module/mr/view/diff.html.php
index 85d2afadbe..e43199ba35 100644
--- a/module/mr/view/diff.html.php
+++ b/module/mr/view/diff.html.php
@@ -69,7 +69,7 @@
         </div>
         <?php foreach($diffs as $diffFile):?>
         <div class='repoCode'>
-          <table class='table diff' id='diff'>
+          <table class='table diff' id='diff' data-entry='<?php echo base64_encode($diffFile->fileName);?>'>
             <caption><?php echo $diffFile->fileName;?></caption>
             <?php if(empty($diffFile->contents)) continue;?>
             <?php foreach($diffFile->contents as $content):?>
diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index 0bcae252cc..0511c5d59a 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -1,9 +1,6 @@
 <?php
-$file= '';
-$suffix = '';
 /* get last review info in this file. */
-$lastReview  = $this->mr->getLastReviewInfo($file);
-$repoModule  = isset($lastReview) && isset($lastReview->module) ? $lastReview->module : '';
+$lastReview  = $this->mr->getLastReviewInfo($repo->id);
 
 /* Get product pairs. */
 if(isset($repo->product) and $repo->product)
@@ -16,108 +13,91 @@ else
 }
 
 /* get product by cookie or last review in this file. */
-$repoProduct = isset($_COOKIE['repoPairs'][$repoID]) ? $_COOKIE['repoPairs'][$repoID] : '';
-$repoProduct = isset($lastReview) && isset($lastReview->product) ? $lastReview->product : $repoProduct;
-$repoProduct = isset($products[$repoProduct]) ? $repoProduct : key($products);
-$executions  = $this->mr->getExecutionPairs($repoProduct);
-$modules     = $this->loadModel('tree')->getOptionMenu($repoProduct, $viewType = 'bug', $startModuleID = 0);
-$users       = $this->loadModel('user')->getPairs('devfirst|nodeleted|noclosed');
-$products    = array('' => '') + $products;
-$executions  = array('' => '') + $executions;
+$repoProduct   = isset($_COOKIE['repoPairs'][$repoID]) ? $_COOKIE['repoPairs'][$repoID] : '';
+$repoProduct   = $lastReview->bug && isset($lastReview->bug->product) ? $lastReview->bug->product : $repoProduct;
+$repoProduct   = isset($products[$repoProduct]) ? $repoProduct : key($products);
+$bugRepoModule = (isset($lastReview->bug) && $lastReview->bug->product == $repoProduct) ? $lastReview->bug->module : '';
+$executions    = $this->mr->getExecutionPairs($repoProduct);
+$modules       = $this->loadModel('tree')->getOptionMenu($repoProduct, $viewType = 'bug', $startModuleID = 0);
+$users         = $this->loadModel('user')->getPairs('devfirst|nodeleted|noclosed');
+$products      = array('' => '') + $products;
+$executions    = array('' => '') + $executions;
 
-$cwd         = getcwd();
-$commiters   = $this->user->getCommiters();
-$blamePairs  = array();
-if($suffix and $suffix != 'binary' and strpos($this->config->repo->images, "|$suffix|") === false)
+$taskExecutions = $executions;
+if(empty($repo->product)) $taskExecutions = array('' => '') + $this->loadModel('execution')->getPairs();
+$repoExecution = $lastReview->task && isset($lastReview->task->execution) ? $lastReview->task->execution : $this->session->execution;
+$repoExecution = isset($taskExecutions[$repoExecution]) ? $repoExecution : key($taskExecutions);
+$taskModules   = array('' => '');
+$taskMembers   = array('' => '');
+if($repoExecution)
 {
-    $blames = $this->scm->blame($entry, $info->revision);
-    foreach($blames as $line => $blame)
-    {
-        if(!isset($blame['committer']))
-        {
-            if(isset($blamePairs[$line - 1])) $blamePairs[$line] = $blamePairs[$line - 1];
-            continue;
-        }
-        $blamePairs[$line] = zget($commiters, $blame['committer'], $blame['committer']);
-    }
+    $taskModules    = $this->loadModel('tree')->getTaskOptionMenu($repoExecution, 0, 0, 'allModule');
+    $taskRepoModule = (isset($lastReview->task) && $lastReview->task->execution == $repoExecution) ? $lastReview->task->module : '';
+    $taskMembers    = $this->loadModel('user')->getTeamMemberPairs($repoExecution, 'execution', 'nodeleted');
 }
-chdir($cwd);
 
-//$reviews         = $this->mr->getReview($repoID, $file, $info->revision);
-$reviews         = $this->mr->getReview($repoID, $file, '');
-$v1              = isset($oldRevision) ? $oldRevision : 0;
+$reviews = $this->mr->getReview($repoID, $MR->id);
+$v1      = isset($oldRevision) ? $oldRevision : 0;
+
 $this->loadModel('repo');
-// $bugUrl          = $this->repo->createLink('addBug',    "repoID=$repoID&file=$file&v1=$v1&v2={$info->revision}");
-$bugUrl          = $this->createLink('mr', 'addBug', "repoID=$repoID&file=$file&v1=$v1&v2=");
-$commentUrl      = $this->createLink('mr', 'addComment');
+
+$taskModuleSelect    = html::select('taskModule', $taskModules, $taskRepoModule, 'class="form-control chosen"');
+$taskUserSelect      = html::select('taskAssignedTo', $taskMembers, '', 'class="form-control chosen"');
+$taskExecutionSelect = html::select('taskExecution', $taskExecutions, $repoExecution, 'class="form-control chosen"');
+
+$reviewUrl       = $this->createLink('mr', 'addReview', "repoID=$repoID&mr={$MR->id}&v1=$v1&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, $repoModule, 'class="form-control chosen"');
-$executionSelect = html::select('execution', $executions, '', 'class="form-control chosen"');
+$moduleSelect    = html::select('module', $modules, $bugRepoModule, 'class="form-control chosen"');
+$executionSelect = html::select('execution', $executions, '', 'class="form-control chosen" onchange="changeExecution(this)"');
 $typeSelect      = html::select('repoType', $lang->repo->typeList, '', 'class="form-control chosen"');
 $userSelect      = html::select('assignedTo', $users, '', 'class="form-control chosen assignedTo"');
-$bugs = array();
+
+$lineReviews = array();
 foreach($reviews as $line => $lineReview)
 {
-    $lineBugs = array();
-    foreach ($lineReview['bugs'] as $bugID => $bug)
+    foreach($lineReview as $objectType => $objects)
     {
-        $lineBug                            = array();
-        $lineBug['id']                      = $bugID;
-        $lineBug['line']                    = $line;
-        $lineBug['title']                   = $bug->title;
-        $lineBug['steps']                   = $bug->steps;
-        $lineBug['realname']                = $bug->realname;
-        $lineBug['openedDate']              = substr($bug->openedDate, 5, 11);
-        $lineBug['lines']                   = $bug->lines;
-        if($bug->edit) $lineBug['edit']     = true;
-        if($bug->delete) $lineBug['delete'] = true;
-
-        if(isset($lineReview['comments']))
+        foreach($objects as $objectID => $object)
         {
-            if(isset($lineReview['comments'][$bugID]))
-            {
-                $comments = $lineReview['comments'][$bugID];
-                $bugComments = array();
-                foreach ($comments as $commentID => $comment)
-                {
-                    $bugComment = array(
-                        'id' => $comment->id,
-                        'edit' => $comment->edit,
-                        'realname' => $comment->realname,
-                        'date' => substr($comment->date, 5, 11),
-                        'comment' => $comment->comment,
-                    );
-                    $bugComments[] = $bugComment;
-                }
-                $lineBug['comments'] = $bugComments;
-            }
+            $lineReview                               = array();
+            $lineReview['id']                         = $objectID;
+            $lineReview['line']                       = $line;
+            $lineReview['title']                      = $objectType == 'bug' ? $object->title : $object->name;
+            $lineReview['content']                    = $objectType == 'bug' ? $object->steps : $object->desc;
+            $lineReview['realname']                   = $object->realname;
+            $lineReview['openedDate']                 = substr($object->openedDate, 5, 11);
+            $lineReview['lines']                      = $object->lines;
+            $lineReview['objectType']                 = $objectType;
+            $lineReview['entry']                      = $object->entry;
+            $lineReview['edit']                       = common::hasPriv($objectType, 'edit');
+            $lineReview['delete']                     = common::hasPriv($objectType, 'delete');
+            $lineReview['view']                       = common::hasPriv($objectType, 'view');
+            $lineReviews[$line][] = $lineReview;
         }
-        $lineBugs[] = $lineBug;
     }
-
-    $bugs[$line] = $lineBugs;
 }
 
-js::set('bugs', $bugs);
+js::set('reviews', $lineReviews);
 js::set('productError', $lang->repo->error->product);
 js::set('contentError', $lang->repo->error->commentText);
 js::set('titleError', $lang->repo->error->title);
 js::set('commentError', $lang->repo->error->comment);
 js::set('submit', $lang->repo->submit);
 js::set('cancel', $lang->repo->cancel);
-js::set('confirmDelete', $lang->repo->notice->deleteBug);
-js::set('confirmDeleteComment', $lang->repo->notice->deleteComment);
+js::set('confirmDelete', $lang->repo->notice->deleteReview);
 js::set('repoID', $repoID);
-// js::set('revision', $info->revision);
+js::set('MRID', $MR->id);
 js::set('revision', '');
-js::set('file', $file);
-js::set('blamePairs', $blamePairs);
 ?>
-<?php if(common::hasPriv('mr', 'addBug')):?>
-<form id="bugForm" class="bugForm main-form hide" method="post" action="<?php echo $bugUrl?>">
-  <div class="bugFormContainer">
+<?php if(common::hasPriv('mr', 'addReview')):?>
+<form id="reviewForm" class="reviewForm main-form hide" method="post" action="<?php echo $reviewUrl?>">
+  <div class="reviewFormContainer">
     <table class='table table-form'>
+      <tr>
+        <th><?php echo $lang->mr->reviewType;?></th>
+        <td><?php echo html::select('reviewType', $lang->mr->reviewTypeList, 'bug', "class='form-control' onchange=changeReviewType(this)")?></td>
+      </tr>
       <tr>
         <th><?php echo $lang->repo->product?></th>
         <td class='w-p45'>
@@ -131,13 +111,22 @@ js::set('blamePairs', $blamePairs);
       </tr>
       <tr>
         <th><?php echo $lang->repo->execution?></th>
-        <td><?php echo $executionSelect?></td>
+        <td>
+          <div class='bugExecutionBox'><?php echo $executionSelect?></div>
+          <div class='taskExecutionBox hide required'><?php echo $taskExecutionSelect?></div>
+        </td>
         <th><?php echo $lang->repo->type?></th>
         <td><?php echo $typeSelect?></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><?php echo $userSelect?></td>
+        <td>
+          <div class='bugAssignedToBox'><?php echo $userSelect?></div>
+          <div class='taskAssignedToBox hide'><?php echo $taskUserSelect?></div>
+        </td>
         <th><?php echo $lang->repo->lines?></th>
         <td class='lines'>
           <div class="input-group">
@@ -149,7 +138,7 @@ js::set('blamePairs', $blamePairs);
       </tr>
       <tr>
         <th><?php echo $lang->repo->title?></th>
-        <td colspan='3'>
+        <td colspan='3' class='required'>
         <?php echo html::input('title', '', "class='form-control'");?>
         </td>
       </tr>
@@ -160,8 +149,9 @@ js::set('blamePairs', $blamePairs);
       <tr>
         <th></th>
         <td colspan="3" class='form-actions'>
-          <?php echo html::submitButton($lang->repo->submit, '', 'btn btn-wide btn-primary bugSubmit');?>
+          <?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>
@@ -169,73 +159,87 @@ js::set('blamePairs', $blamePairs);
   </div>
 </form>
 <?php else:?>
-<form id='bugForm' class='bugForm hide'>
-<?php printf($lang->user->errorDeny, $lang->repo->common, $lang->repo->addBug);?>
+<form id='reviewForm' class='reviewForm hide'>
+<?php printf($lang->user->errorDeny, $lang->repo->common, $lang->repo->addReview);?>
 </form>
 <?php endif;?>
 
-<div class='panel panel-sm hide panel-bug' id='bugPanel'>
+<div class='panel panel-sm hide panel-review' id='reviewPanel'>
   <div class='panel-heading'>
     <div class='panel-actions pull-right'>
-      <?php if(common::hasPriv('bug', 'view')):?>
-      <a href='javascript:;' class='view-bug'>Bug#<span class='bugid'></span></a>
-      <?php else:?>
-      Bug#<span class='bugid'></span>
-      <?php endif;?>
-      <?php if(common::hasPriv('bug', 'edit')):?>
-      <a href='javascript:;' class='edit bugEdit'><i class='icon-pencil'></i></a>
-      <?php endif;?>
-      <?php if(common::hasPriv('bug', 'delete')):?>
-      <a href='javascript:;' class='delete bugDelete'><i class='icon-remove'></i></a>
-      <?php endif;?>
+      <a href='javascript:;' class='delete reviewDelete'><i class='icon-remove'></i></a>
       <a href="javascript:;"><i class='icon-chevron-down'></i></a>
     </div>
-    <i class='icon-bug text-muted'></i> <strong class='title'></strong>
+    <i class='text-muted'></i> <strong class='title'></strong>
   </div>
   <div class='panel-body'>
     <p><?php echo $lang->repo->lines?> <strong class='code-lines'></strong> &nbsp; <i class='icon-user text-muted'></i> <strong class='realname'></strong> &nbsp;<span class='text-muted bug-date'><i class='icon-time'></i> <span class='openedDate'></span></span></p>
-    <form method='post' class='bug-edit-form' action>
-      <input type='text' name='commentText' class='commentInput form-control mgb-10'>
-      <button type='submit' class='btn btn-sm btn-primary bugEditSubmit'><?php echo $lang->repo->submit?></button>
-      <button type='button' class='btn btn-sm bugEditCancel'><?php echo $lang->repo->cancel?></button>
-    </form>
-    <p class='steps text-content'></p>
-    <div class='comments'></div>
-    <?php if(common::hasPriv('repo', 'addComment')):?>
-    <button class='btn btn-sm addComment' type='button'><?php echo $lang->repo->addComment?></button>
-    <form class='commentForm' method='post' action='<?php echo $commentUrl?>' id='commentForm'>
-      <textarea name='comment' class='commentText form-control mgb-10' spellcheck='false' placeholder='<?php echo $lang->repo->notice->commentContent?>'></textarea>
-      <input class='commentSubmit btn btn-sm btn-primary' type='submit' value='<?php echo $lang->repo->submit?>'>
-      <input class='commentCancel btn btn-sm' type='button' value='<?php echo $lang->repo->cancel?>'>
-      <input type='hidden' name='objectID' value=''>
-      <div class='optional'></div>
-    </form>
-    <?php endif;?>
+    <p class='content text-content'></p>
   </div>
 </div>
-<div class='comment hide' id='commentCell'>
-  <i class='icon-user text-muted'></i> <strong class='realname'></strong>: <span class='comment-content text-content'></span> <span class='text-muted comment-date'>&nbsp;<i class='icon-time'></i> <span class='date'></span></span> &nbsp;<a href='javascript:;' class='edit commentEdit pull-right'><i class='icon-pencil'></i></a>
-  <form method='post' class='comment-edit-form' action=''>
-    <textarea name='commentText' class='commentInput form-control mgb-10'></textarea>
-    <button type='submit' class='btn btn-sm btn-primary commentEditSubmit'><?php echo $lang->repo->submit?></button>
-    <button type='button' class='btn btn-sm commentEditCancel'><?php echo $lang->repo->cancel?></button>
-  </form>
-</div>
-<div class='dropdown' id="bugsPreview">
+<div class='dropdown' id="reviewsPreview">
   <ul class='dropdown-menu fade'>
     <li class='dropdown-header'><?php echo $lang->repo->line?><strong class='code-line'></strong> &nbsp; <i class='icon-bug'></i> <strong class='bug-count'>0</strong> &nbsp; <i class='icon-comments-alt'></i> <strong class='comment-count'>0</strong></li>
   </ul>
 </div>
-<div id='rowTip' class='hide'><div class='row-tip'><i class='icon-chat-dot preview-icon'></i><div class='on-expand tip'><span><?php echo $lang->repo->expand?> </span><i class='icon-chevron-down'></i></div><div class='on-collapse tip'><span><?php echo $lang->repo->collapse?> </span><i class='icon-chevron-up'></i></div></div></div>
+<div id='rowTip' class='hide'><div class='row-tip'><div class='on-expand tip'><span><?php echo $lang->repo->expand?> </span><i class='icon-chevron-down'></i></div><div class='on-collapse tip'><span><?php echo $lang->repo->collapse?> </span><i class='icon-chevron-up'></i></div></div></div>
 <script>
+function changeReviewType(select)
+{
+    var reviewType = $(select).val();
+    if(reviewType == 'bug')
+    {
+        $('#product').closest('td').show();
+        $('#product').closest('td').prev().show();
+        $('#module').closest('td').show();
+        $('#module').closest('td').prev().show();
+        $('#repoType').closest('td').show();
+        $('#repoType').closest('td').prev().show();
+
+        $('.taskModuleBox').addClass('hide');
+        $('.bugAssignedToBox').removeClass('hide');
+        $('.taskAssignedToBox').addClass('hide');
+        $('.bugExecutionBox').removeClass('hide');
+        $('.taskExecutionBox').addClass('hide');
+    }
+    else
+    {
+        $('#product').closest('td').hide();
+        $('#product').closest('td').prev().hide();
+        $('#module').closest('td').hide();
+        $('#module').closest('td').prev().hide();
+        $('#repoType').closest('td').hide();
+        $('#repoType').closest('td').prev().hide();
+
+        $('.taskModuleBox').removeClass('hide');
+        $('.bugAssignedToBox').addClass('hide');
+        $('.taskAssignedToBox').removeClass('hide');
+        $('.bugExecutionBox').addClass('hide');
+        $('.taskExecutionBox').removeClass('hide');
+    }
+}
+
 function changeProduct(select)
 {
     loadProductBranches(select);
     productID = $(select).children('option:selected').val();
     link = createLink('repo', 'ajaxGetExecutions', 'productID=' + productID);
-    $(select).closest('.bugFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
+    $(select).closest('.reviewFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
     moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=0&rootModuleID=0&returnType=html');
-    $(select).closest('.bugFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
+    $(select).closest('.reviewFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
+}
+
+function changeExecution(select)
+{
+    if($('#reviewType').val() == 'bug') return false;
+
+    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();});
+
+    assignLink = createLink('execution', 'ajaxGetMembers', 'executionID=' + executionID);
+    $('.taskAssignedToBox').load(assignLink, '', function(){$('.taskAssignedToBox #assignedTo').attr('id', 'taskAssignedTo').attr('name', 'taskAssignedTo').chosen();});
 }
 
 function loadProductBranches(select)
@@ -257,9 +261,9 @@ function loadBranch(select)
     branch = $(select).val();
     productID = $(select).closest('.input-group').find('#product').val();
     link = createLink('repo', 'ajaxGetExecutions', 'productID=' + productID + '&branch=' + branch);
-    $(select).closest('.bugFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
+    $(select).closest('.reviewFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
     moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html');
-    $(select).closest('.bugFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
+    $(select).closest('.reviewFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
 }
 
 function hiddenForm()
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index d75bc9b870..5283beb6f4 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount    = '已经同步记录条数';
 $lang->repo->notice->delete         = '是否要删除该版本库？';
 $lang->repo->notice->successDelete  = '已经成功删除版本库。';
 $lang->repo->notice->commentContent = '输入回复内容';
+$lang->repo->notice->deleteReview   = '确认删除该评审？';
 $lang->repo->notice->deleteBug      = '确认删除该Bug？';
 $lang->repo->notice->deleteComment  = '确认删除该回复？';
 $lang->repo->notice->lastSyncTime   = '最后更新于：';

From 07ce01bda2710d53550b2dec77760eab20345e1a Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 9 Dec 2021 12:28:32 +0800
Subject: [PATCH 05/16]  * Finish task #45439.

---
 module/mr/view/view.html.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index 54667871b7..55f984cbaa 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -61,12 +61,6 @@
                     <th class="w-100px"><?php echo $lang->mr->status;?></th>
                     <td><?php echo zget($lang->mr->statusList, $MR->status);?></td>
                   </tr>
-                  <?php if(isset($rawMR->head_pipeline->status)): ?>
-                  <tr>
-                    <th><?php echo "{$lang->mr->pipeline}{$lang->mr->status}";?></th>
-                    <td><?php echo zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown); ?></td>
-                  </tr>
-                  <?php endif; ?>
                   <tr>
                     <th><?php echo $lang->mr->mergeStatus; ?></th>
                     <?php if(empty($rawMR->changes_count)):?>

From beadf58834aab94b6041db7c1572d2efa28c4337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 9 Dec 2021 13:04:26 +0800
Subject: [PATCH 06/16]  * adjust for bug type for mr.

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

diff --git a/module/mr/model.php b/module/mr/model.php
index 43a9f97221..25cca53f79 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -896,7 +896,7 @@ class mrModel extends model
             ->add('openedBy', $this->app->user->account)
             ->add('openedDate', $now)
             ->add('openedBuild', 'trunk')
-            ->add('type', 'codeimprovement')
+            ->add('type', 'codeerror')
             ->add('repo', $repoID)
             ->add('mr', $mr)
             ->add('lines', $this->post->begin . ',' . $this->post->end)

From cc682f79539ad75f2a1f56e09689d572ad4dfe8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 9 Dec 2021 13:24:00 +0800
Subject: [PATCH 07/16]  * fix error.

---
 module/mr/view/header.review.html.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index 0511c5d59a..b4958cd7b7 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -1,6 +1,6 @@
 <?php
 /* get last review info in this file. */
-$lastReview  = $this->mr->getLastReviewInfo($repo->id);
+$lastReview = $this->mr->getLastReviewInfo($repo->id);
 
 /* Get product pairs. */
 if(isset($repo->product) and $repo->product)
@@ -14,7 +14,7 @@ else
 
 /* get product by cookie or last review in this file. */
 $repoProduct   = isset($_COOKIE['repoPairs'][$repoID]) ? $_COOKIE['repoPairs'][$repoID] : '';
-$repoProduct   = $lastReview->bug && isset($lastReview->bug->product) ? $lastReview->bug->product : $repoProduct;
+$repoProduct   = (isset($lastReview->bug) && isset($lastReview->bug->product)) ? $lastReview->bug->product : $repoProduct;
 $repoProduct   = isset($products[$repoProduct]) ? $repoProduct : key($products);
 $bugRepoModule = (isset($lastReview->bug) && $lastReview->bug->product == $repoProduct) ? $lastReview->bug->module : '';
 $executions    = $this->mr->getExecutionPairs($repoProduct);
@@ -25,10 +25,11 @@ $executions    = array('' => '') + $executions;
 
 $taskExecutions = $executions;
 if(empty($repo->product)) $taskExecutions = array('' => '') + $this->loadModel('execution')->getPairs();
-$repoExecution = $lastReview->task && isset($lastReview->task->execution) ? $lastReview->task->execution : $this->session->execution;
-$repoExecution = isset($taskExecutions[$repoExecution]) ? $repoExecution : key($taskExecutions);
-$taskModules   = array('' => '');
-$taskMembers   = array('' => '');
+$repoExecution  = (isset($lastReview->task) && isset($lastReview->task->execution)) ? $lastReview->task->execution : $this->session->execution;
+$repoExecution  = isset($taskExecutions[$repoExecution]) ? $repoExecution : key($taskExecutions);
+$taskModules    = array('' => '');
+$taskRepoModule = 0;
+$taskMembers    = array('' => '');
 if($repoExecution)
 {
     $taskModules    = $this->loadModel('tree')->getTaskOptionMenu($repoExecution, 0, 0, 'allModule');

From 973bb32da44fa2f55a1244583492f54ccb71d5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 9 Dec 2021 13:30:48 +0800
Subject: [PATCH 08/16]  * fix error.

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

diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index b4958cd7b7..6371bca0e7 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -14,9 +14,9 @@ else
 
 /* get product by cookie or last review in this file. */
 $repoProduct   = isset($_COOKIE['repoPairs'][$repoID]) ? $_COOKIE['repoPairs'][$repoID] : '';
-$repoProduct   = (isset($lastReview->bug) && isset($lastReview->bug->product)) ? $lastReview->bug->product : $repoProduct;
+$repoProduct   = (!empty($lastReview->bug) && isset($lastReview->bug->product)) ? $lastReview->bug->product : $repoProduct;
 $repoProduct   = isset($products[$repoProduct]) ? $repoProduct : key($products);
-$bugRepoModule = (isset($lastReview->bug) && $lastReview->bug->product == $repoProduct) ? $lastReview->bug->module : '';
+$bugRepoModule = (!empty($lastReview->bug) && $lastReview->bug->product == $repoProduct) ? $lastReview->bug->module : '';
 $executions    = $this->mr->getExecutionPairs($repoProduct);
 $modules       = $this->loadModel('tree')->getOptionMenu($repoProduct, $viewType = 'bug', $startModuleID = 0);
 $users         = $this->loadModel('user')->getPairs('devfirst|nodeleted|noclosed');
@@ -25,7 +25,7 @@ $executions    = array('' => '') + $executions;
 
 $taskExecutions = $executions;
 if(empty($repo->product)) $taskExecutions = array('' => '') + $this->loadModel('execution')->getPairs();
-$repoExecution  = (isset($lastReview->task) && isset($lastReview->task->execution)) ? $lastReview->task->execution : $this->session->execution;
+$repoExecution  = (!empty($lastReview->task) && isset($lastReview->task->execution)) ? $lastReview->task->execution : $this->session->execution;
 $repoExecution  = isset($taskExecutions[$repoExecution]) ? $repoExecution : key($taskExecutions);
 $taskModules    = array('' => '');
 $taskRepoModule = 0;
@@ -33,7 +33,7 @@ $taskMembers    = array('' => '');
 if($repoExecution)
 {
     $taskModules    = $this->loadModel('tree')->getTaskOptionMenu($repoExecution, 0, 0, 'allModule');
-    $taskRepoModule = (isset($lastReview->task) && $lastReview->task->execution == $repoExecution) ? $lastReview->task->module : '';
+    $taskRepoModule = (!empty($lastReview->task) && $lastReview->task->execution == $repoExecution) ? $lastReview->task->module : '';
     $taskMembers    = $this->loadModel('user')->getTeamMemberPairs($repoExecution, 'execution', 'nodeleted');
 }
 

From f7e55495bea8d7a5f923b635649f6a6f5b4bcbf3 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 06:04:33 +0000
Subject: [PATCH 09/16] * Optimize page style.

---
 module/gitlab/control.php                    | 2 ++
 module/gitlab/css/browsebranchpriv.css       | 2 ++
 module/gitlab/model.php                      | 2 +-
 module/gitlab/view/browsebranchpriv.html.php | 7 +++++--
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 module/gitlab/css/browsebranchpriv.css

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 3fed1904c8..e359263c64 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -727,6 +727,7 @@ class gitlab extends control
     {
         $keyword  = fixer::input('post')->setDefault('keyword', '')->get('keyword');
         $branches = $this->gitlab->apiGetBranchPrivs($gitlabID, $projectID, $keyword, $orderBy);
+        $project  = $this->gitlab->apiGetSingleProject($gitlabID, $projectID);
 
         /* Pager. */
         $this->app->loadClass('pager', $static = true);
@@ -740,6 +741,7 @@ class gitlab extends control
         $this->view->levelLang  = $this->lang->gitlab->branch->branchCreationLevelList;
         $this->view->gitlabID   = $gitlabID;
         $this->view->projectID  = $projectID;
+        $this->view->project    = $project;
         $this->view->orderBy    = $orderBy;
         $this->view->branchList = empty($branchList) ? $branchList: $branchList[$pageID - 1];
         $this->display();
diff --git a/module/gitlab/css/browsebranchpriv.css b/module/gitlab/css/browsebranchpriv.css
new file mode 100644
index 0000000000..d86ca85e6a
--- /dev/null
+++ b/module/gitlab/css/browsebranchpriv.css
@@ -0,0 +1,2 @@
+.text-c-counts > span {margin-left: 5px;}
+#mainMenu .pull-left {margin-right: 15px;}
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 8ba4c6a5e6..5f061ba251 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -2311,7 +2311,7 @@ class gitlabModel extends model
         $newBranches = array();
         foreach($branches as $branch)
         {
-            if(empty($keyword) || stristr($branch->name, $keyword)) $newBranches[$branch->$order[0]] = $branch;
+            if(empty($keyword) || stristr($branch->name, $keyword)) $newBranches[$branch->{$order[0]}] = $branch;
         }
 
         if($order[1] == 'asc')  ksort($newBranches);
diff --git a/module/gitlab/view/browsebranchpriv.html.php b/module/gitlab/view/browsebranchpriv.html.php
index 4697480e78..e201121ecd 100644
--- a/module/gitlab/view/browsebranchpriv.html.php
+++ b/module/gitlab/view/browsebranchpriv.html.php
@@ -15,6 +15,9 @@
   <div class='pull-left'>
     <?php echo html::a($this->createLink('gitlab', 'browseProject', "gitlabID=$gitlabID"), "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-secondary'");?>
   </div>
+  <div id="sidebarHeader">
+    <div class="title"><?php echo $project->name_with_namespace; ?></div>
+  </div>
   <div class="btn-toolbar pull-left">
     <div>
       <form id='branchPrivForm' method='post'>
@@ -51,8 +54,8 @@
       </thead>
       <tbody>
         <?php foreach ($branchList as $id => $branch): ?>
-        <?php $branch->merge_access_level = count($branch->merge_access_levels) > 1 ? 40 : $branch->merge_access_levels[0]->access_level; ?>
-        <?php $branch->push_access_level  = count($branch->push_access_levels) > 1 ? 40 : $branch->push_access_levels[0]->access_level; ?>
+        <?php $branch->merge_access_level = $this->gitlab->checkAccessLevel($branch->merge_access_levels); ?>
+        <?php $branch->push_access_level  = $this->gitlab->checkAccessLevel($branch->push_access_levels); ?>
         <tr class='text'>
           <td class='text-c-name' title='<?php echo $branch->name;?>'><?php echo $branch->name;?></td>
           <td class-'text' title="<?php echo $levelLang[$branch->merge_access_level];?>"><?php echo $levelLang[$branch->merge_access_level];?></td>

From cb6dbdf1d164ad95fe52d75c478647626a0bd816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 9 Dec 2021 14:42:14 +0800
Subject: [PATCH 10/16]  * fix error for task #45504.

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

diff --git a/module/mr/model.php b/module/mr/model.php
index 25cca53f79..e1d8b4efcc 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1018,7 +1018,7 @@ class mrModel extends model
             $taskInfo['edit']       = common::hasPriv('task', 'edit');
             $taskInfo['view']       = common::hasPriv('task', 'view');
             $taskInfo['delete']     = common::hasPriv('task', 'delete');
-            $taskInfo['lines']      = $data->lines;
+            $taskInfo['lines']      = $task->lines;
             $taskInfo['line']       = $this->post->begin;
             $taskInfo['content']    = $task->desc;
             $taskInfo['title']      = $data->title;

From 60e6727f35e05a3c48b55118aaa32ceede660ab0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 06:48:32 +0000
Subject: [PATCH 11/16] * Add mouseover title.

---
 module/gitlab/view/browsebranchpriv.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/gitlab/view/browsebranchpriv.html.php b/module/gitlab/view/browsebranchpriv.html.php
index e201121ecd..aac65f7b7e 100644
--- a/module/gitlab/view/browsebranchpriv.html.php
+++ b/module/gitlab/view/browsebranchpriv.html.php
@@ -16,7 +16,7 @@
     <?php echo html::a($this->createLink('gitlab', 'browseProject', "gitlabID=$gitlabID"), "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-secondary'");?>
   </div>
   <div id="sidebarHeader">
-    <div class="title"><?php echo $project->name_with_namespace; ?></div>
+    <div class="title" title="<?php echo $project->name_with_namespace; ?>"><?php echo $project->name_with_namespace; ?></div>
   </div>
   <div class="btn-toolbar pull-left">
     <div>

From c2513ccc92b7fe11a03e146a02f0593cd43da1a0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 07:12:35 +0000
Subject: [PATCH 12/16] * Adjust codes.

---
 module/gitlab/control.php                    | 25 ++++++++++++--------
 module/gitlab/js/browsebranchpriv.js         |  2 +-
 module/gitlab/model.php                      | 15 ++++++------
 module/gitlab/view/browsebranchpriv.html.php | 10 ++++----
 module/gitlab/view/createbranchpriv.html.php | 10 ++++----
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index e359263c64..2c010170ce 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -713,10 +713,11 @@ class gitlab extends control
     }
 
     /**
-     * Browse gitlab branch priv.
+     * Browse gitlab protect branch.
      *
      * @param  int    $gitlabID
-     * @param  string $keyword
+     * @param  int    $projectID
+     * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
@@ -735,7 +736,7 @@ class gitlab extends control
         $pager      = new pager($recTotal, $recPerPage, $pageID);
         $branchList = array_chunk($branches, $pager->recPerPage);
 
-        $this->view->keyword    = urldecode(urldecode($keyword));
+        $this->view->keyword    = $keyword;
         $this->view->pager      = $pager;
         $this->view->title      = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseBranchPriv;
         $this->view->levelLang  = $this->lang->gitlab->branch->branchCreationLevelList;
@@ -748,7 +749,7 @@ class gitlab extends control
     }
 
     /**
-     * Set a gitlab branch protect.
+     * Set a gitlab protect branch.
      *
      * @param  int    $gitlabID
      * @param  int    $projectID
@@ -766,10 +767,11 @@ class gitlab extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browseBranchPriv', "gitlabID=$gitlabID&projectID=$projectID")));
         }
 
+        // Initialize data, and the operation authority is the maintainers by default.
         $branchPriv = new stdClass();
         $branchPriv->name               = '';
-        $branchPriv->merge_access_level = 40;
-        $branchPriv->push_access_level  = 40;
+        $branchPriv->mergeAccessLevel = 40;
+        $branchPriv->pushAccessLevel  = 40;
 
         $gitlab = $this->gitlab->getByID($gitlabID);
         $title  = $this->lang->gitlab->createBranchPriv;
@@ -778,8 +780,8 @@ class gitlab extends control
         {
             $title      = $this->lang->gitlab->editBranchPriv;
             $branchPriv = $this->gitlab->apiGetSingleBranchPriv($gitlabID, $projectID, $branch);
-            $branchPriv->merge_access_level = $this->gitlab->checkAccessLevel($branchPriv->merge_access_levels);
-            $branchPriv->push_access_level  = $this->gitlab->checkAccessLevel($branchPriv->push_access_levels);
+            $branchPriv->mergeAccessLevel = $this->gitlab->checkAccessLevel($branchPriv->merge_access_levels);
+            $branchPriv->pushAccessLevel  = $this->gitlab->checkAccessLevel($branchPriv->push_access_levels);
         }
 
         $gitlabBranches  = $this->gitlab->apiGetBranches($gitlabID, $projectID);
@@ -787,7 +789,8 @@ class gitlab extends control
         $protectNames    = array_keys($protectBranches);
 
         $branches = array();
-        foreach($gitlabBranches as $oneBranch) {
+        foreach($gitlabBranches as $oneBranch)
+        {
             if(!in_array($oneBranch->name, $protectNames) || $oneBranch->name == $branch) $branches[$oneBranch->name] = $oneBranch->name;
         }
 
@@ -817,10 +820,12 @@ class gitlab extends control
     }
 
     /**
-     * Delete a gitlab branch priv.
+     * Delete a gitlab protect branch.
      *
      * @param  int    $gitlabID
      * @param  int    $projectID
+     * @param  string $branch
+     * @param  string $confirm
      * @access public
      * @return void
      */
diff --git a/module/gitlab/js/browsebranchpriv.js b/module/gitlab/js/browsebranchpriv.js
index 33077a1755..359b60ab85 100644
--- a/module/gitlab/js/browsebranchpriv.js
+++ b/module/gitlab/js/browsebranchpriv.js
@@ -10,7 +10,7 @@ $(document).ready(function()
     })
 
 });
-
+// Trigger filtering function.
 function triggerSearch()
 {
     $("#branchPrivForm").submit();
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 5f061ba251..d1cb27bf25 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -2289,13 +2289,12 @@ class gitlabModel extends model
     }
 
     /**
-     * Get branch priv of one project.
+     * Get protect branches of one project.
      *
      * @param  int    $gitlabID
      * @param  int    $projectID
      * @param  string $keyword
      * @param  string $orderBy
-     * @param  object $pager
      * @access public
      * @return array
      */
@@ -2321,7 +2320,7 @@ class gitlabModel extends model
     }
 
     /**
-     * Get single branch priv by API.
+     * Get single protct branch by API.
      *
      * @param  int    $gitlabID
      * @param  int    $projectID
@@ -2336,7 +2335,7 @@ class gitlabModel extends model
     }
 
     /**
-     * Create gitlab branch priv.
+     * Create gitlab potect branch.
      *
      * @param  int    $gitlabID
      * @param  int    $projectID
@@ -2382,11 +2381,11 @@ class gitlabModel extends model
     }
 
     /**
-     * Delete a gitab branch priv by api.
+     * Delete a gitab protect branch by api.
      *
-     * @param  int $gitlabID
-     * @param  int $groupID
-     * @param  int $memberID
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
      * @access public
      * @return object
      */
diff --git a/module/gitlab/view/browsebranchpriv.html.php b/module/gitlab/view/browsebranchpriv.html.php
index aac65f7b7e..9ef6455f88 100644
--- a/module/gitlab/view/browsebranchpriv.html.php
+++ b/module/gitlab/view/browsebranchpriv.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * The browse view file of gitlab branch priv of ZenTaoPMS.
+ * The browse view file of gitlab protext branch of ZenTaoPMS.
  *
- * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Gang Liu <liugang@cnezsoft.com>
+ * @author      Yanyi Cao <caoyanyi@easycorp.ltd>
  * @package     gitlab
  * @version     $Id$
  * @link        http://www.zentao.net
@@ -21,8 +21,8 @@
   <div class="btn-toolbar pull-left">
     <div>
       <form id='branchPrivForm' method='post'>
-      <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->branch->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
-      <a id="branchSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
+        <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->branch->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
+        <a id="branchSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
       </form>
     </div>
   </div>
diff --git a/module/gitlab/view/createbranchpriv.html.php b/module/gitlab/view/createbranchpriv.html.php
index 25cd246d53..e5589fe36c 100644
--- a/module/gitlab/view/createbranchpriv.html.php
+++ b/module/gitlab/view/createbranchpriv.html.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * The create view file of gitlab module of ZenTaoPMS.
+ * The create view file of protext branch of ZenTaoPMS.
  *
- * @copyright   Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Gang Liu <liugang@cnezsoft.com>
+ * @author      Yanyi Cao <caoyanyi@easycorp.ltd>
  * @package     gitlab
  * @version     $Id$
  * @link        http://www.zentao.net
@@ -26,11 +26,11 @@
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->branch->mergeAllowed;?></th>
-            <td><?php echo html::select('merge_access_level', $lang->gitlab->branch->branchCreationLevelList, $branchPriv->merge_access_level, "class='form-control'");?></td>
+            <td><?php echo html::select('merge_access_level', $lang->gitlab->branch->branchCreationLevelList, $branchPriv->mergeAccessLevel, "class='form-control'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->branch->pushAllowed;?></th>
-            <td><?php echo html::select('push_access_level', $lang->gitlab->branch->branchCreationLevelList, $branchPriv->push_access_level, "class='form-control'");?></td>
+            <td><?php echo html::select('push_access_level', $lang->gitlab->branch->branchCreationLevelList, $branchPriv->pushAccessLevel, "class='form-control'");?></td>
           </tr>
           <tr>
             <th></th>

From 8cb4c2a94ccfca3854f00cc17e1ad0233d57cc1a Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 07:14:02 +0000
Subject: [PATCH 13/16] * Add comment.

---
 module/gitlab/js/browsebranchpriv.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/gitlab/js/browsebranchpriv.js b/module/gitlab/js/browsebranchpriv.js
index 359b60ab85..806b8bc4e1 100644
--- a/module/gitlab/js/browsebranchpriv.js
+++ b/module/gitlab/js/browsebranchpriv.js
@@ -10,7 +10,13 @@ $(document).ready(function()
     })
 
 });
-// Trigger filtering function.
+
+/**
+ * Trigger filtering function. 
+ * 
+ * @access public
+ * @return void
+ */
 function triggerSearch()
 {
     $("#branchPrivForm").submit();

From ca73678ccd96730cbf9979edfbb2e7492f5041bc Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Dec 2021 07:15:45 +0000
Subject: [PATCH 14/16] * Modify comment.

---
 module/gitlab/control.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 2c010170ce..f0bee97aa1 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -767,11 +767,10 @@ class gitlab extends control
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browseBranchPriv', "gitlabID=$gitlabID&projectID=$projectID")));
         }
 
-        // Initialize data, and the operation authority is the maintainers by default.
         $branchPriv = new stdClass();
         $branchPriv->name               = '';
-        $branchPriv->mergeAccessLevel = 40;
-        $branchPriv->pushAccessLevel  = 40;
+        $branchPriv->mergeAccessLevel = 40; // Initialize data, and the operation authority is the maintainers by default.
+        $branchPriv->pushAccessLevel  = 40; // Initialize data, and the operation authority is the maintainers by default.
 
         $gitlab = $this->gitlab->getByID($gitlabID);
         $title  = $this->lang->gitlab->createBranchPriv;

From fe5571a0ed20c13ded54e17b8bb92e31e98413b1 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 9 Dec 2021 07:46:07 +0000
Subject: [PATCH 15/16] * Fix bug#17141

---
 module/gitlab/js/managegroupmembers.js   | 4 ++--
 module/gitlab/js/manageprojectmembers.js | 4 ++--
 module/mr/lang/zh-cn.php                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/gitlab/js/managegroupmembers.js b/module/gitlab/js/managegroupmembers.js
index 589e0ffc61..f67e13d81e 100644
--- a/module/gitlab/js/managegroupmembers.js
+++ b/module/gitlab/js/managegroupmembers.js
@@ -41,6 +41,6 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
-    if($('#teamForm .table tbody').children().length < 2) return false;
+    if($('#teamForm .table-form tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
-}
\ No newline at end of file
+}
diff --git a/module/gitlab/js/manageprojectmembers.js b/module/gitlab/js/manageprojectmembers.js
index 589e0ffc61..f67e13d81e 100644
--- a/module/gitlab/js/manageprojectmembers.js
+++ b/module/gitlab/js/manageprojectmembers.js
@@ -41,6 +41,6 @@ function addItem(obj)
  */
 function deleteItem(obj)
 {
-    if($('#teamForm .table tbody').children().length < 2) return false;
+    if($('#teamForm .table-form tbody').children().length < 2) return false;
     $(obj).closest('tr').remove();
-}
\ No newline at end of file
+}
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index d4608feb93..38ae4979c3 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -102,7 +102,7 @@ $lang->mr->closeSuccess        = "已关闭合并请求。";
 
 $lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target";
 
-$lang->mr->errorLang[0] = '源项目分支不能和目标项目分支一样';
+$lang->mr->errorLang[0] = '源项目分支与目标项目分支不能相同';
 
 $lang->mr->from = "从";
 $lang->mr->to   = "合并到";

From dc7416ebb4f8246b1fb30558eecb3fc967eacbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 9 Dec 2021 15:54:41 +0800
Subject: [PATCH 16/16]  * adjust code for mr.

---
 module/group/lang/resource.php        |  4 +-
 module/mr/js/diff.js                  | 65 ++++++++++++++-------------
 module/mr/lang/en.php                 | 11 +++--
 module/mr/lang/zh-cn.php              |  4 +-
 module/mr/model.php                   |  2 +-
 module/mr/view/header.review.html.php | 26 +++++------
 module/repo/lang/en.php               |  1 +
 7 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index f4abbb41bb..0b900bc124 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1290,7 +1290,7 @@ $lang->resource->mr->unlink    = 'unlink';
 $lang->resource->mr->approval  = 'approval';
 $lang->resource->mr->close     = 'close';
 $lang->resource->mr->reopen    = 'reopen';
-$lang->resource->mr->addBug    = 'addBug';
+$lang->resource->mr->addReview = 'addReview';
 
 $lang->mr->methodOrder[10] = 'create';
 $lang->mr->methodOrder[15] = 'browse';
@@ -1307,7 +1307,7 @@ $lang->mr->methodOrder[75] = 'unlink';
 $lang->mr->methodOrder[80] = 'approval';
 $lang->mr->methodOrder[85] = 'close';
 $lang->mr->methodOrder[90] = 'reopen';
-$lang->mr->methodOrder[95] = 'addBug';
+$lang->mr->methodOrder[95] = 'addReview';
 
 /* Git. */
 $lang->resource->git = new stdclass();
diff --git a/module/mr/js/diff.js b/module/mr/js/diff.js
index b0ab2c451a..fba408bb13 100644
--- a/module/mr/js/diff.js
+++ b/module/mr/js/diff.js
@@ -5,6 +5,13 @@ $(document).ready(function()
     $(".label-exchange").click(function(){ $('#exchange').submit();});
 });
 
+/**
+ * Change encoding.
+ *
+ * @param  string $encoding
+ * @access public
+ * @return void
+ */
 function changeEncoding(encoding)
 {
     $('#encoding').val(encoding);
@@ -14,11 +21,8 @@ function changeEncoding(encoding)
 $(document).ready(function()
 {
     var $diffCode = $('.diff');
-    var hidePreview;
-    var $reviewsPreview = $('#reviewsPreview');
-    var $reviewsPreviewMenu = $('#reviewsPreview').children('.dropdown-menu');
-    var $rows = $diffCode.find('tr');
-    var rowTip = $('#rowTip').html();
+    var $rows     = $diffCode.find('tr');
+    var rowTip    = $('#rowTip').html();
     var lastLine;
     $rows.each(function()
     {
@@ -48,10 +52,10 @@ $(document).ready(function()
         $(this).removeClass("over");
     });
 
-    var isInline = $.cookie('arrange') == 'inline';
+    var isInline       = $.cookie('arrange') == 'inline';
     var $reviewFormRow = $('<tr class="action-row"><th></th>' + (isInline ? '<th></th><td class="action-cell"></td>' : '<td colspan="3" class="action-cell"></td>') + '</tr>');
-    var $reviewForm = $('#reviewForm');
-    var $reviewPanel = $('#reviewPanel');
+    var $reviewForm    = $('#reviewForm');
+    var $reviewPanel   = $('#reviewPanel');
     $reviewFormRow.find('td').append($reviewForm.removeClass('hide'));
 
     var highlight = function($e)
@@ -62,7 +66,6 @@ $(document).ready(function()
 
     var createReview = function(review, line, show)
     {
-        var commentCount, j;
         var $review = $reviewPanel.clone().removeClass('hide').attr('id', review.objectType + '-' + review.id);
         $review.find('.realname').text(review.realname);
         $review.find('.openedDate').text(review.openedDate);
@@ -174,7 +177,7 @@ $(document).ready(function()
 
         if(confirm(confirmDelete))
         {
-            var link  = createLink($review.data('objectType'), 'delete', 'id=' + $review.data('id') + '&confirm=yes');
+            var link = createLink($review.data('objectType'), 'delete', 'id=' + $review.data('id') + '&confirm=yes');
             $.get(link, function(data)
             {
                 var $commentRow = $review.closest('.comment-row');
@@ -283,30 +286,30 @@ $(document).ready(function()
         $('.highlight').removeClass('highlight');
     });
 
+    /**
+     * Anchor
+     *
+     * @access public
+     * @return void
+     */
     function anchor()
     {
-        var hash  = window.location.hash;
-        if(hash)
+        var hash = window.location.hash;
+        if(!hash) return false;
+
+        var line = hash.substr(1).replace('L', '');
+        var $row = $('.diff tr[data-line="' + line +'"]').first();
+        if($row.length) return false;
+
+        var anchor = $row.offset().top;
+        $('body,html').animate({scrollTop:anchor - 50}, 500);
+
+        $row.addClass('highlight');
+        if($row.hasClass('commented'))
         {
-            var line = hash.substr(1).replace('L', '');
-            var $row = $('.diff tr[data-line="' + line +'"]').first();
-            if($row.length)
-            {
-                var anchor = $row.offset().top;
-
-                $('body,html').animate({scrollTop:anchor - 50}, 500);
-
-                $row.addClass('highlight');
-                if($row.hasClass('commented'))
-                {
-                    toggleComment($row, true);
-                    var $commentRow = $row.next('tr');
-                    if($commentRow.hasClass('comment-row'))
-                    {
-                        $commentRow.addClass('highlight');
-                    }
-                }
-            }
+            toggleComment($row, true);
+            var $commentRow = $row.next('tr');
+            if($commentRow.hasClass('comment-row')) $commentRow.addClass('highlight');
         }
     }
 });
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index 102d6f192c..b8016139ec 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -21,11 +21,11 @@ $lang->mr->linkStory = 'Link Stories';
 $lang->mr->linkBug   = 'Link Bugs';
 $lang->mr->linkTask  = 'Link Tasks';
 $lang->mr->unlink    = 'UnLink of stories,Bugs,tasks';
-$lang->mr->addBug    = 'Add Review';
+$lang->mr->addReview = 'Add Review';
 
 $lang->mr->id          = 'ID';
 $lang->mr->mriid       = "raw MR ID";
-$lang->mr->title        = 'Name';
+$lang->mr->title       = 'Name';
 $lang->mr->status      = 'Status';
 $lang->mr->author      = 'Author';
 $lang->mr->assignee    = 'Assignee';
@@ -46,7 +46,12 @@ $lang->mr->reject   = 'Reject';
 $lang->mr->close    = 'Close';
 $lang->mr->reopen   = 'Reopen';
 
-$lang->mr->approvalResult = 'Approval result';
+$lang->mr->reviewType     = 'Review Type';
+$lang->mr->reviewTypeList = array();
+$lang->mr->reviewTypeList['bug']  = 'Bug';
+$lang->mr->reviewTypeList['task'] = 'Task';
+
+$lang->mr->approvalResult     = 'Approval result';
 $lang->mr->approvalResultList = array();
 $lang->mr->approvalResultList['approve'] = 'Approve';
 $lang->mr->approvalResultList['reject']  = 'Reject';
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index c5c87e9a91..0cf6efa7c8 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -46,12 +46,12 @@ $lang->mr->reject   = '拒绝';
 $lang->mr->close    = '关闭';
 $lang->mr->reopen   = '重新打开';
 
-$lang->mr->reviewType = '评审类型';
+$lang->mr->reviewType     = '评审类型';
 $lang->mr->reviewTypeList = array();
 $lang->mr->reviewTypeList['bug']  = 'Bug';
 $lang->mr->reviewTypeList['task'] = '任务';
 
-$lang->mr->approvalResult = '评审意见';
+$lang->mr->approvalResult     = '评审意见';
 $lang->mr->approvalResultList = array();
 $lang->mr->approvalResultList['approve'] = '通过';
 $lang->mr->approvalResultList['reject']  = '拒绝';
diff --git a/module/mr/model.php b/module/mr/model.php
index e1d8b4efcc..199d5aa584 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -906,7 +906,7 @@ class mrModel extends model
             ->remove('begin,end,uid,reviewType,taskExecution,taskModule,taskAssignedTo')
             ->get();
 
-        $data->steps  = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
+        $data->steps = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
         if($data->assignedTo) $data->assignedDate = $now;
         unset($data->commentText);
 
diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index 6371bca0e7..5cf64cc281 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -61,19 +61,19 @@ foreach($reviews as $line => $lineReview)
     {
         foreach($objects as $objectID => $object)
         {
-            $lineReview                               = array();
-            $lineReview['id']                         = $objectID;
-            $lineReview['line']                       = $line;
-            $lineReview['title']                      = $objectType == 'bug' ? $object->title : $object->name;
-            $lineReview['content']                    = $objectType == 'bug' ? $object->steps : $object->desc;
-            $lineReview['realname']                   = $object->realname;
-            $lineReview['openedDate']                 = substr($object->openedDate, 5, 11);
-            $lineReview['lines']                      = $object->lines;
-            $lineReview['objectType']                 = $objectType;
-            $lineReview['entry']                      = $object->entry;
-            $lineReview['edit']                       = common::hasPriv($objectType, 'edit');
-            $lineReview['delete']                     = common::hasPriv($objectType, 'delete');
-            $lineReview['view']                       = common::hasPriv($objectType, 'view');
+            $lineReview               = array();
+            $lineReview['id']         = $objectID;
+            $lineReview['line']       = $line;
+            $lineReview['title']      = $objectType == 'bug' ? $object->title : $object->name;
+            $lineReview['content']    = $objectType == 'bug' ? $object->steps : $object->desc;
+            $lineReview['realname']   = $object->realname;
+            $lineReview['openedDate'] = substr($object->openedDate, 5, 11);
+            $lineReview['lines']      = $object->lines;
+            $lineReview['objectType'] = $objectType;
+            $lineReview['entry']      = $object->entry;
+            $lineReview['edit']       = common::hasPriv($objectType, 'edit');
+            $lineReview['delete']     = common::hasPriv($objectType, 'delete');
+            $lineReview['view']       = common::hasPriv($objectType, 'view');
             $lineReviews[$line][] = $lineReview;
         }
     }
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index a908cc5891..e5fa02bbc2 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount    = 'The number of records synchronized is ';
 $lang->repo->notice->delete         = 'Do you want to delete this repo?';
 $lang->repo->notice->successDelete  = 'Repository is removed.';
 $lang->repo->notice->commentContent = 'Comment';
+$lang->repo->notice->deleteReview   = 'Do you want to delete this review?';
 $lang->repo->notice->deleteBug      = 'Do you want to delete this bug?';
 $lang->repo->notice->deleteComment  = 'Do you want to delete this comment?';
 $lang->repo->notice->lastSyncTime   = 'Last Sync:';