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

课程动态中留言链接BUG修复

This commit is contained in:
nwb 2014-06-27 11:24:48 +08:00
parent 3565b9da88
commit beeab518e8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/journals_for_message.rb
View File

@ -33,9 +33,13 @@ class JournalsForMessage < ActiveRecord::Base
:description => Proc.new{|o| o.notes }, :description => Proc.new{|o| o.notes },
:type => Proc.new {|o| o.jour_type }, :type => Proc.new {|o| o.jour_type },
:url => Proc.new {|o| :url => Proc.new {|o|
(o.jour.kind_of? Project) ? {:controller => 'projects', :action => 'feedback', :id => o.jour, :r => o.id, :anchor => "word_li_#{o.id}"} : {} if o.jour.kind_of? Project
}#{:controller => 'documents', :action => 'show', :id => o.id}} {:controller => 'projects', :action => 'feedback', :id => o.jour, :r => o.id, :anchor => "word_li_#{o.id}"}
acts_as_activity_provider :author_key => :user_id, elsif o.jour.kind_of? Course
{:controller => 'courses', :action => 'feedback', :id => o.jour, :r => o.id, :anchor => "word_li_#{o.id}"}
end
}
acts_as_activity_provider :author_key => :user_id,
:timestamp => "#{self.table_name}.updated_on", :timestamp => "#{self.table_name}.updated_on",
:find_options => {:include => :project } :find_options => {:include => :project }

1
app/views/courses/show.html.erb
View File

@ -26,6 +26,7 @@
<%= l(:label_new_activity) %> </span> <%= l(:label_new_activity) %> </span>
<%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url %> <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url %>
</td> </td>
</tr> </tr>