jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue查看差别界面

This commit is contained in:
huang 2016-11-02 14:18:17 +08:00
parent 5a506d7c40
commit 9da165b2b7
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/journals_controller.rb
View File

@ -45,6 +45,9 @@ class JournalsController < ApplicationController
end end
def diff def diff
# 顶部导航
@project_menu_type = 2
@issue = @journal.issue @issue = @journal.issue
if params[:detail_id].present? if params[:detail_id].present?
@detail = @journal.details.find_by_id(params[:detail_id]) @detail = @journal.details.find_by_id(params[:detail_id])
@ -55,7 +58,7 @@ class JournalsController < ApplicationController
@diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value) @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
respond_to do |format| respond_to do |format|
format.html { format.html {
render :layout => 'new_base' render :layout => 'base_projects'
} }
end end
end end

23
app/views/journals/diff.html.erb
View File

@ -1,10 +1,17 @@
<h3><%=h @issue.tracker %> #<%= @issue.id %></h3> <div class="myissues_con mb10">
<p>由<%= @journal.user %> 更新于 <%= format_time @journal.created_on %></p> <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
<p class="mb5">由<%= link_to @journal.user, user_path(@journal.user), :class => "c_blue" %> 更新于 <%= format_time @journal.created_on %></p>
<div class="text-diff" style="word-break:break-all; word-wrap:break-word;">
<div class="mb10 fl">之前版本：</div><div class="fl"><%= @detail.old_value.html_safe %></div>
<div class="cl"></div>
<div class="fl"> 当前版本：</div><div class="fl"><%= @detail.value.html_safe %></div>
<div class="cl"></div>
<%#= @diff.to_html.gsub("&lt;","<").gsub("&gt;",">").gsub("&quot;","\"").gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;quot;", "\"").html_safe %>
</div>
<p><%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %></p>
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<div class="text-diff" style="word-break:break-all; word-wrap:break-word;">
<%= @diff.to_html.gsub("&lt;","<").gsub("&gt;",">").gsub("&quot;","\"").gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;quot;", "\"").html_safe %>
</div> </div>
<p><%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %></p>
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>