From 21747d02a2413607c722070c29d1cfc9f6a76af9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 4 Aug 2016 11:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BAPR=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?JS=E8=B7=B3=E8=BD=ACHTML=E8=B7=B3=E8=BD=AC=EF=BC=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                |  4 +--
 app/views/pull_requests/_new.html.erb  | 19 +++++------
 app/views/pull_requests/_show.html.erb | 43 +++++++++++++++++++++++++
 app/views/pull_requests/create.js.erb  |  2 +-
 app/views/pull_requests/new.html.erb   |  3 +-
 app/views/pull_requests/show.html.erb  | 44 +-------------------------
 app/views/pull_requests/show.js.erb    |  1 +
 7 files changed, 58 insertions(+), 58 deletions(-)
 create mode 100644 app/views/pull_requests/_show.html.erb
 create mode 100644 app/views/pull_requests/show.js.erb

diff --git a/Gemfile b/Gemfile
index 1c1edfd35..6ee66a592 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
-gem "test-unit", "~>3.0"
+# gem "test-unit", "~>3.0"
 
 ### profile
-gem 'oneapm_rpm'
+# gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'
diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb
index 16f299ca5..54c7434b0 100644
--- a/app/views/pull_requests/_new.html.erb
+++ b/app/views/pull_requests/_new.html.erb
@@ -1,19 +1,16 @@
-<div id="create_pull_request_error">
+<div id="pull_request_new_form">
+  <div id="create_pull_request_error">
     <%= render :partial => "pull_requests/error_message" %>
-</div>
+  </div>
 
-<div id="new-merge-request" class="new-merge-request">
-  <div class="f14 fontGrey3 fb mb10">新的合并请求</div>
-  <!--<div>-->
-    <!--<span class="fl fontGrey2">从 <span class="fontGrey3 fb">dev_huang</span>  合并至 <span class="fontGrey3 fb">master</span></span><a href="javascript:void(0);" class="fr linkGrey2">修改分支</a>-->
-    <!--<div class="cl"></div>-->
-  <!--</div>-->
+  <div class="new-merge-request">
+    <div class="f14 fontGrey3 fb mb10">新的合并请求</div>
+  </div>
+  <%= render :partial => "pull_requests/form" %>
 </div>
-<%= render :partial => "pull_requests/form" %>
-
 
 <script>
-    $("#new-merge-request").parent().css("width","730px");
+    $("#pull_request_new_form").parent().css("width","730px");
 
     $("#changed-files").toggle(function(){
         $("#changed-files-detail").show();
diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
new file mode 100644
index 000000000..3015a4d7a
--- /dev/null
+++ b/app/views/pull_requests/_show.html.erb
@@ -0,0 +1,43 @@
+<div id="mergeShow" class="f14 fontGrey2 merge-show">
+  <span class="mr10 open-status">待处理</span><span class="mr10">合并请求</span>   由<%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
+  <!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
+  <div class="cl"></div>
+</div>
+<div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
+<div class="mt10 mb15">
+  请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
+  <div class="merge-commit-option mt15">
+    <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
+  </div>
+</div>
+<ul class="merge-record" style="border-top:1px solid #ddd;">
+  <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
+  <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
+</ul>
+<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
+<div id="merge_record_0">
+  <%= render :partial => "pull_requests/pull_request_commits" %>
+</div>
+<div id="merge_record_1" class="undis">
+  <%= render :partial => "pull_requests/pull_request_changes" %>
+</div>
+
+<script>
+    $("#mergeShow").parent().css("width","730px");
+
+    $("#changed-files").toggle(function(){
+        $("#changed-files-detail").show();
+    },function(){
+        $("#changed-files-detail").hide();
+    });
+
+    $(".merge-record li a").click(function(){
+        $(".merge-record li a").removeClass("active");
+        $(this).addClass("active");
+
+        var index = $(".merge-record li a").index(this);
+
+        $("#merge_record_0, #merge_record_1").hide();
+        $("#merge_record_" + index).show();
+    });
+</script>
\ No newline at end of file
diff --git a/app/views/pull_requests/create.js.erb b/app/views/pull_requests/create.js.erb
index 36c9368af..ce5f50ac0 100644
--- a/app/views/pull_requests/create.js.erb
+++ b/app/views/pull_requests/create.js.erb
@@ -1 +1 @@
-$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
\ No newline at end of file
+$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb
index 47ba66f09..e7494708c 100644
--- a/app/views/pull_requests/new.html.erb
+++ b/app/views/pull_requests/new.html.erb
@@ -1,2 +1,3 @@
 <%= render :partial => "pull_requests/pull_request_container" %>
-<%= render :partial => "pull_requests/new" %>
\ No newline at end of file
+<%= render :partial => "pull_requests/new" %>
+
diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb
index 2564dda77..8cbbdc081 100644
--- a/app/views/pull_requests/show.html.erb
+++ b/app/views/pull_requests/show.html.erb
@@ -1,44 +1,2 @@
 <%= render :partial => "pull_requests/pull_request_container" %>
-<div id="mergeShow" class="f14 fontGrey2 merge-show">
-  <span class="mr10 open-status">待处理</span><span class="mr10">合并请求</span>   由<%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
-  <!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
-  <div class="cl"></div>
-</div>
-<div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
-<div class="mt10 mb15">
-  请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
-  <div class="merge-commit-option mt15">
-    <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
-  </div>
-</div>
-<ul class="merge-record" style="border-top:1px solid #ddd;">
-  <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
-  <li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
-</ul>
-<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
-<div id="merge_record_0">
-  <%= render :partial => "pull_requests/pull_request_commits" %>
-</div>
-<div id="merge_record_1" class="undis">
-  <%= render :partial => "pull_requests/pull_request_changes" %>
-</div>
-
-<script>
-    $("#mergeShow").parent().css("width","730px");
-
-    $("#changed-files").toggle(function(){
-        $("#changed-files-detail").show();
-    },function(){
-        $("#changed-files-detail").hide();
-    });
-
-    $(".merge-record li a").click(function(){
-        $(".merge-record li a").removeClass("active");
-        $(this).addClass("active");
-
-        var index = $(".merge-record li a").index(this);
-
-        $("#merge_record_0, #merge_record_1").hide();
-        $("#merge_record_" + index).show();
-    });
-</script>
\ No newline at end of file
+<%= render :partial => "pull_requests/show" %>
\ No newline at end of file
diff --git a/app/views/pull_requests/show.js.erb b/app/views/pull_requests/show.js.erb
new file mode 100644
index 000000000..af5935536
--- /dev/null
+++ b/app/views/pull_requests/show.js.erb
@@ -0,0 +1 @@
+$("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
\ No newline at end of file