dashboard_controller.rb in kit_cms-2.3.17

- old
+ new

@@ -3,14 +3,21 @@
 
   def user_comment
     comment = Comment.sys(_sid).where(:id=>params[:id]).first
 
     if comment
-      comment.update_attributes(params[:comment])
+      if params[:delete]
+        comment.destroy
+        render :js=>"$('tr.comment_#{comment.id}').remove();"
+      else
+        comment.update_attributes(params[:comment])
+        render :js=>"updated(#{comment.id}, #{comment.is_moderated}, #{comment.is_visible});"
+      end
+      return
     end
 
-    render :js=>"updated(#{comment.id}, #{comment.is_moderated}, #{comment.is_visible});"
+    render :js=>""
   end
 
   def user_comments
     if params.size==2
       params[:unmoderated] = "1"
@@ -421,10 +428,12 @@
       @activity = @activity.where(Activity.arel_table[:name].matches("%#{params[:for]}%").or(Activity.arel_table[:name].matches("%#{params[:for]}%"))).sys(_sid)
     else
     @activity = @activity.includes(:user)
     end
     @activity = @activity.where(["category = ?", params[:cat]]) if params[:cat]
+    @activity = @activity.sys(_sid)
     @activity = @activity.order("created_at desc").page(params[:page]).per(100)
+    
 
     if request.xhr?
       render :partial=>"activity_list"
     else
       render "activity", :layout=>"cms"