From 2999fd6e49552f8bf9d246e29603e25b910ac3c0 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Thu, 19 Aug 2021 18:18:56 +0800
Subject: [PATCH] * Finish the view of creating MR(staging).

---
 module/mr/js/create.js         | 31 ++++++++++++++++++++-----------
 module/mr/lang/zh-cn.php       |  1 +
 module/mr/view/create.html.php | 22 +++++++++++++++++++---
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/module/mr/js/create.js b/module/mr/js/create.js
index a1492677f9..d324201335 100644
--- a/module/mr/js/create.js
+++ b/module/mr/js/create.js
@@ -2,10 +2,10 @@ $(function()
 {
     $('#gitlabID').change(function()
     {
-        host  = $('#gitlabID').val();
+        host = $('#gitlabID').val();
         if(host == '') return false;
-        url   = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host);
 
+        url = createLink('repo', 'ajaxgetgitlabprojects', "host=" + host);
         $.get(url, function(response)
         {
             $('#sourceProject').html('').append(response);
@@ -13,18 +13,27 @@ $(function()
         });
     });
 
-    $('#sourceProject').change(function()
+    $('#sourceProject,#targetProject').change(function()
     {
-        $option = $(this).find('option:selected');
-        $('#name').val($option.data('name'));
-        project = $('#sourceProject').val();
-        url   = createLink('gitlab', 'ajaxgetprojectbranches', "gitlabID=" + host + "&projectID=" + project);
-        $.get(url, function(response)
+        sourceProject = $(this).val();
+        var branchSelect = $(this).parents('td').find('select[name*=Branch]');
+        branchUrl = createLink('gitlab', 'ajaxgetprojectbranches', "gitlabID=" + host + "&projectID=" + sourceProject);
+        $.get(branchUrl, function(response)
         {
-            $('#sourceBranch').html('').append(response);
-            $('#sourceBranch').chosen().trigger("chosen:updated");;
+            branchSelect.html('').append(response);
+            branchSelect.chosen().trigger("chosen:updated");;
         });
 
-        $('#targetProject').chosen().trigger("chosen:updated");;
+    });
+
+    $('#sourceProject').change(function()
+    {
+        sourceProject = $(this).val();
+        projectUrl = createLink('mr', 'ajaxGetMRTragetProjects', "gitlabID=" + host + "&projectID=" + sourceProject);
+        $.get(projectUrl, function(response)
+        {
+            $('#targetProject').html('').append(response);
+            $('#targetProject').chosen().trigger("chosen:updated");;
+        });
     });
 });
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 326919596f..130955462d 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -17,6 +17,7 @@ $lang->mr->reviewer = '评审人';
 $lang->mr->link     = 'GitLab链接';
 $lang->mr->canMerge = '是否可合并';
 
+$lang->mr->description   = '描述';
 $lang->mr->confirmDelete = '确认删除该merge request吗？';
 $lang->mr->sourceProject = '源项目';
 $lang->mr->sourceBranch  = '源分支';
diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php
index d05a6824db..6acccf70ee 100644
--- a/module/mr/view/create.html.php
+++ b/module/mr/view/create.html.php
@@ -15,8 +15,8 @@
       <form id='mrForm' method='post' class='form-ajax'>
         <table class='table table-form'>
           <tr>
-            <th><?php echo $lang->repo->gitlabHost;?></th>
-              <td class='required'><?php echo html::select('gitlabID', $gitlabHosts, '', "class='form-control' placeholder='{$lang->repo->placeholder->gitlabHost}'");?>
+            <th><?php echo $lang->gitlab->common;?></th>
+            <td class='required'><?php echo html::select('gitlabID', $gitlabHosts, '', "class='form-control'");?></td>
           </tr>
           <tr>
              <th><?php echo $lang->mr->sourceProject;?></th>
@@ -38,10 +38,26 @@
                </div>
              </td>
           </tr>
+          <tr>
+            <th><?php echo $lang->mr->name;?></th>
+            <td class='required'><?php echo html::input('title', '', "class='form-control'"); ?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->mr->description; ?></th>
+            <td colspan='1'><?php echo html::textarea('description', '', "rows='3' class='form-control'"); ?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->mr->assignee;?></th>
+            <td><?php echo html::select('assignee', $users, '', "class='form-control chosen'")?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->mr->reviewer;?></th>
+            <td><?php echo html::select('reviewer', $users, '', "class='form-control chosen'")?></td>
+          </tr>
           <tr>
             <th></th>
             <td colspan='2' class='text-center form-actions'>
-              <?php echo html::submitButton($lang->mr->cmpAndContinue); ?>
+              <?php echo html::submitButton(); ?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
           </tr>