课程讨论区的点赞

app/controllers/praise_tread_controller.rb

@@ -6,38 +6,46 @@ class PraiseTreadController < ApplicationController
   def praise_plus
     @obj = nil
     # @is_in_list = nil
+    if @pt = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",@obj_id,@obj_type.to_s,User.current.id).first
+      
+    end
       if request.get?
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
-      @horizontal = params[:horizontal].downcase == "false" ? false:true
+      #@horizontal = params[:horizontal].downcase == "false" ? false:true
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
       unless @obj.author_id == User.current.id
         praise_tread_plus(@obj_type,@obj_id,1)
       end
-
+      @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+      @type = params[:type] if params[:type]
     end
   end
 
   def praise_minus
     @obj = nil
     if request.get?
-      @obj = params[:obj]  # 传的是对象，最后变成id了
-
+      #@obj = params[:obj]  # 传的是对象，最后变成id了
+      @obj_id = params[:obj_id]
+      @obj_type = params[:obj_type]
       #首先更新praise_tread 表 删除关注记录
-      @pt = PraiseTread.find_by_user_id_and_praise_tread_object_id_and_praise_tread_object_type(User.current.id,@obj,"user")
-      @pt.delete
+      #@pt = PraiseTread.find_by_user_id_and_praise_tread_object_id_and_praise_tread_object_type(User.current.id,@obj,"user")
+      @pt = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",@obj_id,@obj_type.to_s,User.current.id).first
+      @pt.delete if !@pt.nil?
 
       #再更新praise_tread_cache表 使相应的记录减1 当为0时删除
-      @ptc = PraiseTreadCache.find_by_object_id(@obj)
-      @ptc.minus(1)
+      @ptc = PraiseTreadCache.where("object_id=? and object_type=?",@obj_id,@obj_type.to_s).first
+      @ptc.minus(1) if !@ptc.nil?
       if @ptc.praise_num == 0
         @ptc.delete
       end
 
     end
-    @obj = User.find_by_id(@obj)
+    #@obj = User.find_by_id(@obj)
+    @obj = find_object_by_type_and_id(@obj_type,@obj_id)
+    @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+    @type = params[:type] if params[:type]
     respond_to do |format|
-      format.html
       format.js
     end
   end
@@ -48,7 +56,7 @@ class PraiseTreadController < ApplicationController
     if request.get?
       @obj_id = params[:obj_id]
       @obj_type = params[:obj_type]
-      @horizontal = params[:horizontal].downcase == "false" ? false:true
+      #@horizontal = params[:horizontal].downcase == "false" ? false:true
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
       unless @obj.author_id == User.current.id
         praise_tread_plus(@obj_type,@obj_id,0)

app/views/praise_tread/_praise.html.erb

@@ -0,0 +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? %>
+    <a href="<%= praise_tread_praise_plus_path({:obj_id=>activity.id,:obj_type=>activity.class })%>" data-remote="true" class="ml15 likeButton" title="点赞" >
+      <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></a>
+<% else %>
+    <a href="<%= praise_tread_praise_minus_path({:obj_id=>activity.id,:obj_type=>activity.class })%>" data-remote="true" class="ml15 likeButton" title="取消点赞" >
+      <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></a>
+<% end %>

app/views/praise_tread/praise_minus.js.erb

@@ -1,3 +1,10 @@
+<% if @user_activity_id %>
+    <% 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 %>
+    <% end %>
+<% else %>
     $('#praise_tread').html('<%= j(
     render :partial => "/praise_tread/praise_tread",:locals => {:obj => @obj,:show_flag => false,:user_id => User.current.id,:horizontal=>@horizontal}
     )%>');
+<% end %>

app/views/praise_tread/praise_plus.js.erb

@@ -2,6 +2,11 @@
     $('#praise_tread_<%= @obj.id %>').html('<%= j(
         render :partial => "/memos/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal}
     )%>');
+<% elsif @user_activity_id %>
+    <% 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 %>
+    <% end %>
 <% else %>
     $('#praise_tread_<%= @obj.id %>').html('<%= j(
     render :partial => "/praise_tread/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal}

app/views/users/_course_message.html.erb

@@ -92,11 +92,17 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count<=0 && !activity.locked ? '': 'none' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
-        <%= count %>
-        )</div>
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn>▪
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count > 3 %>
           <div class="homepagePostReplyBannerMore">
@@ -131,6 +137,7 @@
                           <%= 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) %>
+                      <a href="javascript:void(0);" class="fr likeButton" title="点赞"> <span class="likeText">赞</span><span class="likeNum">（10）</span></a>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>

config/routes.rb

@@ -385,6 +385,7 @@ RedmineApp::Application.routes.draw do
   get "tags/show"
 
   get "praise_tread/praise_plus"
+  get "praise_tread/praise_minus"
 
   get "praise_tread/tread_plus"
   #end