数据获取及展示

app/controllers/pull_requests_controller.rb

@@ -77,6 +77,7 @@ class PullRequestsController < ApplicationController
 
   # 获取某次请求的改动
   def pull_request_changes
+    @type = 2
     @changes = @g.merge_request_changes(@project.gpid, params[:id])
   end
 

app/views/pull_requests/_pull_request_changes.html.erb

@@ -1,12 +1,13 @@
-<div class="showing-changes-row fontGrey2" style="width:730px; margin:0 -10px;">Showing <a href="javascript:void(0)" class="linkGrey3 fb" id="changed-files">3 changed files</a> with <span class="c_green fb">3 additions</span> and <span class="c_red fb">3 deletions</span>
+<% @changes.each do |changes| %>
+    <div class="showing-changes-row fontGrey2" style="width:730px; margin:0 -10px;">Showing <a href="javascript:void(0)" class="linkGrey3 fb" id="changed-files">3 changed files</a> with <span class="c_green fb">3 additions</span> and <span class="c_red fb">3 deletions</span>
       <ol class="mt10" id="changed-files-detail">
         <li><a href="javascript:void(0)" class="linkGrey3">app/views/organizations/_org_course_homework.html.erb</a> </li>
         <li><a href="javascript:void(0)" class="linkGrey3">app/views/users/_course_homework.html.erb</a> </li>
         <li><a href="javascript:void(0)" class="linkGrey3">app/views/users/_user_homework_detail.html.erb</a> </li>
       </ol>
-</div>
-<div class="showing-changes-row fontGrey2" style="width:730px; margin:0 -10px;"><a href="javascript:void(0)" class="linkGrey3"><img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" />app/views/organizations/_org_course_homework.html.erb</a></div>
-<div class="showing-changes-detail" style="width:750px; margin:0 -10px;">
+    </div>
+    <div class="showing-changes-row fontGrey2" style="width:730px; margin:0 -10px;"><a href="javascript:void(0)" class="linkGrey3"><img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" />app/views/organizations/_org_course_homework.html.erb</a></div>
+    <div class="showing-changes-detail" style="width:750px; margin:0 -10px;">
       <table class="changes-detail-chart">
         <tr>
           <td class="diff-line-number fontGrey2">99</td>
@@ -29,4 +30,5 @@
           <td class="fontGrey2 p10 code-line-new">+ &lt;div class="fl mr20 fontGrey3 w80"&gt;</td>
         </tr>
       </table>
-</div>
+    </div>
+<% end %>

app/views/pull_requests/new.html.erb

@@ -1,2 +1,2 @@
 <%= render :partial => "pull_requests/pull_request_container" %>
-<% render :partial => "pull_requests/new" %>
+<%= render :partial => "pull_requests/new" %>

app/views/pull_requests/pull_request_changes.js.erb

@@ -0,0 +1 @@
+$("#merge_record_1").html('<%= render :partial => "pull_requests/pull_request_changes" %>');

app/views/pull_requests/show.html.erb

@@ -19,9 +19,11 @@
 <div class="new-merge-wrap" id="merge_record_0">
   <%= render :partial => "pull_requests/pull_request_commits" %>
 </div>
-<div id="merge_record_1" class="undis">
+<% if @type == 2 %>
+    <div id="merge_record_1" class="undis">
       <%= render :partial => "pull_requests/pull_request_changes" %>
-</div>
+    </div>
+<% end %>
 
 <script>
     $("#mergeShow").parent().css("width","730px");