修改项目资源时间显示跳转错误页面问题

tmp
huang 10 years ago
parent 8b9ee2260a
commit 7361f40b0c

@ -756,15 +756,16 @@ module ApplicationHelper
return ss return ss
end end
def time_tag(time, *args) # def time_tag(time, *args)
options = args.extract_options! # options = args.extract_options!
text = distance_of_time_in_words(Time.now, time) # text = distance_of_time_in_words(Time.now, time)
if @project # if @project
link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time))) # content_tag('acronym', text, options.reverse_merge(:title => format_time(time)))
else # # link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time)))
content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) # else
end # content_tag('acronym', text, options.reverse_merge(:title => format_time(time)))
end # end
# end
def syntax_highlight_lines(name, content) def syntax_highlight_lines(name, content)
lines = [] lines = []

Loading…
Cancel
Save