From 7084a3fed9c32a4db080522ca0d1a6e157db7257 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 4 Aug 2016 14:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BApull=20request=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99JS=E6=8E=A7=E5=88=B6=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_form.html.erb | 32 +++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb
index f6c28488e..1366ef466 100644
--- a/app/views/pull_requests/_form.html.erb
+++ b/app/views/pull_requests/_form.html.erb
@@ -1,7 +1,7 @@
 <%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id), :id => 'pull_request_form', :method => "post", :remote => true) do %>
     <div class="new-merge-wrap">
-      <div class="merge-option-name fl mt8">标题</div><input type="text" name="title" class="merge-title-input fl ml30" />
-      <!--<p class="fl ml100 fontGrey2 mt5">标题以<span class="c_red">[WIP]</span>或<span class="c_red">WIP</span>开头：以防还在进程中的合并请求在它完成之前被合并</p>-->
+      <div class="merge-option-name fl mt8">标题</div><input type="text" id="pr_name" name="title" class="merge-title-input fl ml30" />
+      <p id ="pull_request_title" class="fl ml100 fontGrey2 mt5 c_red" style="display: none">标题不能为空</p>
       <div class="cl mb10"></div>
       <div class="merge-option-name fl">描述</div><textarea type="text" name="description" class="merge-description-input fl ml30"></textarea>
       <!--<p class="fl ml100 f12 mt5"><a href="javascript:void(0);" class="AnnexBtn fl mr10">上传附件</a></p>-->
@@ -20,8 +20,34 @@
       <div class="cl"></div>
     </div>
     <div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">
-      <a href="javascript:void(0);" class="BlueCirBtn fl ml10" onclick="$('#pull_request_form').submit()">提交请求</a>
+      <a href="javascript:void(0);" class="BlueCirBtn fl ml10" onclick="pull_request_commit()">提交请求</a>
       <%= link_to "返回", project_pull_requests_path(:project_id => @project.id), :class => "fr linkGrey2 mt5 mr10" %>
       <div class="cl"></div>
     </div>
 <% end %>
+
+<script>
+    function regex_pr_name()
+    {
+        var name = $.trim($("#pr_name").val());
+        if(name.length == 0)
+        {
+            $("#pull_request_title").show();
+            return false;
+        }
+        else
+        {
+            $("#pull_request_title").hide();
+            return true;
+        }
+    }
+
+    //提交pull request
+    function pull_request_commit()
+    {
+        if(regex_pr_name())
+        {
+            $("#pull_request_form").submit();
+        }
+    }
+</script>
\ No newline at end of file