diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb index 36d9251e1..be1c77aa2 100644 --- a/app/controllers/praise_tread_controller.rb +++ b/app/controllers/praise_tread_controller.rb @@ -10,12 +10,12 @@ class PraiseTreadController < ApplicationController end @activity = false - if request.get? - if !params[:user_activity_id].nil? && !params[:type].nil? - @user_activity_id = params[:user_activity_id] - @type = params[:type] - @activity = true - end + if request.get? + if !params[:user_activity_id].nil? && !params[:type].nil? + @user_activity_id = params[:user_activity_id] + @type = params[:type] + @activity = true + end @obj_id = params[:obj_id] @obj_type = params[:obj_type] #@horizontal = params[:horizontal].downcase == "false" ? false:true @@ -23,7 +23,10 @@ class PraiseTreadController < ApplicationController unless @obj.author_id == User.current.id praise_tread_plus(@obj_type,@obj_id,1) end + respond_to do |format| + format.js end + end end def praise_minus @@ -122,10 +125,6 @@ class PraiseTreadController < ApplicationController @ptc.save @ptc.plus(flag,1) end - respond_to do |format| - format.html - format.js - end end end diff --git a/app/views/praise_tread/_praise.html.erb b/app/views/praise_tread/_praise.html.erb index b1a14bb81..4fd961251 100644 --- a/app/views/praise_tread/_praise.html.erb +++ b/app/views/praise_tread/_praise.html.erb @@ -1,7 +1,7 @@ <% if PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",activity.id,activity.class.to_s,User.current.id).empty? %> - + 赞<%= get_praise_num(activity) > 0 ? "(#{get_praise_num(activity)})" : "" %> <% else %> - + 赞<%= get_praise_num(activity) > 0 ? "(#{get_praise_num(activity)})" : "" %> <% end %> \ No newline at end of file diff --git a/app/views/praise_tread/praise_minus.js.erb b/app/views/praise_tread/praise_minus.js.erb index 63d30d3a5..b55624930 100644 --- a/app/views/praise_tread/praise_minus.js.erb +++ b/app/views/praise_tread/praise_minus.js.erb @@ -1,7 +1,8 @@ <% if @activity %> <% if @type.to_s == 'activity' %> $('#praise_count_<%=@user_activity_id %>').html('<%= j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>'); - <% else %> + <% else @type.to_s == 'reply' %> + $('#reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>'); <% end %> <% else %> $('#praise_tread').html('<%= j( diff --git a/app/views/praise_tread/praise_plus.js.erb b/app/views/praise_tread/praise_plus.js.erb index ce14ec1f8..29041cd57 100644 --- a/app/views/praise_tread/praise_plus.js.erb +++ b/app/views/praise_tread/praise_plus.js.erb @@ -5,7 +5,8 @@ <% elsif @activity %> <% if @type.to_s == 'activity' %> $('#praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"activity"})%>'); - <% else %> + <% else @type.to_s == 'reply' %> + $('#reply_praise_count_<%=@user_activity_id %>').html('<%=j(render :partial=> "praise_tread/praise", :locals => {:activity=>@obj, :user_activity_id=>@user_activity_id,:type=>"reply"})%>'); <% end %> <% else %> $('#praise_tread_<%= @obj.id %>').html('<%= j( diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 21bf87c9b..fbde9717b 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -137,7 +137,14 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> <% end %> <%= format_time(reply.created_on) %> - 赞(10) + + <% if reply.author == User.current %> + 赞<%= get_praise_num(reply) > 0 ? "(#{get_praise_num(reply)})" : "" %> + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%> + <% end %> + +