diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 75433526..d8781abb 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -23,8 +23,10 @@ class JournalsForMessage < ActiveRecord::Base end def act_as_activity - if self.jour_type == 'Principal' - self.acts << Activity.new(:user_id => self.user_id) + if self.jour_type == 'Principal' + unless self.user_id == self.jour.id && self.user_id != self.reply_id + self.acts << Activity.new(:user_id => self.user_id) + end end end end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 366fb8f2..84e03c3c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -20,6 +20,7 @@ <% @activity.each do |e| %> <% act = e.act %> <% unless act.nil? %> + @@ -28,26 +29,26 @@
<% case e.act_type %> <% when 'JournalsForMessage' %> - <% if User.current.login == @user.login %> + <% if User.current.login == @user.login %> <% if e.user_id == act.jour.id %> - + <% else %> - - - <% end %> + + <% end %> <% else %> <% end %> <% if act.reward_type ==3 %>
<%= link_to("#{e.user.show_name}", user_path(e.user_id)) %> 给你留言了
<%= link_to("#{e.user.show_name}", user_path(e.user_id)) %> 有了留言
<%= link_to("#{e.user.show_name}", user_path(e.user_id)) %> 给 <%= link_to("#{act.jour.show_name}", user_path(act.jour.id)) %> 留言了 
<%= link_to("#{e.user.show_name}", user_path(e.user_id)) %> 给 <%= link_to("#{act.jour.show_name}", user_path(act.jour.id)) %> 留言了 
<%= link_to("#{@user.show_name}", user_path(e.user_id)) %> 有了新的动态
-

- <%=link_to act.notes, user_path(e.user_id) %> +

+ <%=textilizable act.notes %>

-
+
+ <% when 'Bid' %>