hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

完成changes数据获取及展示

Browse Source
dev_blankdatabase
huang 9 years ago
parent 8e329db4d8
commit b8cccdffda
5 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/pull_requests_controller.rb
Unescape View File

@ -48,6 +48,7 @@ class PullRequestsController < ApplicationController
end end
def show def show
@type = params[:type]
@request = @g.merge_request(@project.gpid, params[:id]) @request = @g.merge_request(@project.gpid, params[:id])
@commits = @g.merge_request_commits(@project.gpid, params[:id].to_i) @commits = @g.merge_request_commits(@project.gpid, params[:id].to_i)
end end
@ -72,12 +73,12 @@ class PullRequestsController < ApplicationController
# 获取某次请求的提交次数 # 获取某次请求的提交次数
def pull_request_commits def pull_request_commits
@type = parms[:type]
@commits = @g.merge_request_commits(@project.gpid, params[:id].to_i) @commits = @g.merge_request_commits(@project.gpid, params[:id].to_i)
end end
# 获取某次请求的改动 # 获取某次请求的改动
def pull_request_changes def pull_request_changes
@type = 2
@changes = @g.merge_request_changes(@project.gpid, params[:id]) @changes = @g.merge_request_changes(@project.gpid, params[:id])
end end

11
app/helpers/pull_requests_helper.rb
Unescape View File

@ -1,2 +1,13 @@
module PullRequestsHelper module PullRequestsHelper
# 获取diff内容行号
def diff_line_num content
content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.nil? ? "" : content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
end
# 处理内容
def diff_content content
content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
end
end end

65
app/views/pull_requests/_pull_request_changes.html.erb
Unescape View File

@ -1,34 +1,33 @@
<% @changes.each do |changes| %> <% if @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> <% @changes.try(:changes).each do |cd| %>
<ol class="mt10" id="changed-files-detail"> <div class="showing-changes-row fontGrey2">
<li><a href="javascript:void(0)" class="linkGrey3">app/views/organizations/_org_course_homework.html.erb</a> </li> <a href="javascript:void()" class="linkGrey3" id="changed-files">
<li><a href="javascript:void(0)" class="linkGrey3">app/views/users/_course_homework.html.erb</a> </li> <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd['new_path'] %>
<li><a href="javascript:void(0)" class="linkGrey3">app/views/users/_user_homework_detail.html.erb</a> </li> </a>
</ol> </div>
</div> <div class="autoscroll">
<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> <table class="filecontent syntaxhl" style="width:100%;" >
<div class="showing-changes-detail" style="width:750px; margin:0 -10px;"> <tbody>
<table class="changes-detail-chart"> <% line_num = diff_line_num(cd['diff']) %>
<tr> <% diff_content = diff_content(cd['diff']) %>
<td class="diff-line-number fontGrey2">99</td> <% syntax_highlight_lines('new_path', Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
<td class="diff-line-number fontGrey2">99</td> <tr>
<td class="fontGrey2 p10">&lt;% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %&gt;</td> <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
</tr> <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
<tr> </th>
<td class="diff-line-number fontGrey2">100</td> <% if line[0,1] == "-" %>
<td class="diff-line-number fontGrey2">100</td> <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
<td class="fontGrey2 p10">&lt;div class="mt10"&gt;</td> <% elsif line[0,1] == "+" %>
</tr> <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
<tr> <% else%>
<td class="diff-line-number fontGrey2 number-line-old">111</td> <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
<td class="diff-line-number fontGrey2 number-line-old"></td> <% end %>
<td class="fontGrey2 p10 code-line-old">- &lt;div class="fl mr5 fontGrey3"&gt;</td> </tr>
</tr> <% line_num += 1 %>
<tr class="code-line-new"> <% end %>
<td class="diff-line-number fontGrey2 number-line-new"></td> </tbody>
<td class="diff-line-number fontGrey2 number-line-new">111</td> </table>
<td class="fontGrey2 p10 code-line-new">+ &lt;div class="fl mr20 fontGrey3 w80"&gt;</td> </div>
</tr> <% end %>
</table>
</div>
<% end %> <% end %>

2
app/views/pull_requests/pull_request_changes.js.erb
Unescape View File

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

12
app/views/pull_requests/show.html.erb
Unescape View File

@ -12,18 +12,16 @@
</div> </div>
</div> </div>
<ul class="merge-record" style="border-top:1px solid #ddd;"> <ul class="merge-record" style="border-top:1px solid #ddd;">
<li><%= link_to "提交<span class='project-number-dot'>1</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id), :remote => true, :class => "active" %></li> <li><%= link_to "提交<span class='project-number-dot'>1</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'>1</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id), :remote => true, :class => "active" %></li> <li><%= link_to "改动<span class='project-number-dot'>1</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
</ul> </ul>
<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div> <div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
<div id="merge_record_0"> <div id="merge_record_0">
<%= render :partial => "pull_requests/pull_request_commits" %> <%= render :partial => "pull_requests/pull_request_commits" %>
</div> </div>
<% if @type == 2 %> <div id="merge_record_1" class="undis">
<div id="merge_record_1" class="undis"> <%= render :partial => "pull_requests/pull_request_changes" %>
<%= render :partial => "pull_requests/pull_request_changes" %> </div>
</div>
<% end %>
<script> <script>
$("#mergeShow").parent().css("width","730px"); $("#mergeShow").parent().css("width","730px");

Write Preview
Loading…
Cancel
Save