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

修改项目缺陷描述查看差别时404问题

This commit is contained in:
huang 2015-06-15 13:11:35 +08:00
parent aacd3af1fe
commit 761840e0a4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/journals_controller.rb
View File

@ -56,7 +56,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 => 'project_base' render :layout => 'new_base'
} }
end end
end end

15
app/helpers/issues_helper.rb
View File

@ -361,15 +361,16 @@ module IssuesHelper
end end
end end
# 之所以注释是因为该功能冗余了
if detail.property == 'attr' && detail.prop_key == 'description' if detail.property == 'attr' && detail.prop_key == 'description'
s = l(:text_journal_changed_no_detail, :label => label) s = l(:text_journal_changed_no_detail, :label => label)
unless no_html # unless no_html
diff_link = link_to l(:label_diff), # diff_link = link_to l(:label_diff),
{:controller => 'journals', :action => 'diff', :id => detail.journal_id, # {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
:detail_id => detail.id, :only_path => options[:only_path]}, # :detail_id => detail.id, :only_path => options[:only_path]},
:title => l(:label_view_diff) # :title => l(:label_view_diff)
s << " (#{ diff_link })" # s << " (#{ diff_link })"
end # end
s.html_safe s.html_safe
elsif detail.value.present? elsif detail.value.present?
case detail.property case detail.property