diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index eb7ee4c03..aabce249c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -42,7 +42,7 @@ class UsersController < ApplicationController
:activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
:user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
:user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist,:sort_syllabus_list,
- :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks]
+ :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_collect]
before_filter :auth_user_extension, only: :show
#before_filter :rest_user_score, only: :show
#before_filter :select_entry, only: :user_projects
@@ -3424,6 +3424,21 @@ class UsersController < ApplicationController
end
end
+ #取消收藏班级/项目
+ def cancel_collect
+ if params[:project]
+ member = Member.where("user_id = #{@user.id} and project_id = #{params[:project].to_i}")
+ elsif params[:course]
+ member = Member.where("user_id = #{@user.id} and course_id = #{params[:course].to_i}")
+ end
+ unless member.empty?
+ member.first.update_attribute(:is_collect => 0)
+ end
+ respond_to do |format|
+ format.js
+ end
+end
+
def user_projectlist
@order, @c_sort, @type, @list_type = 1, 2, 1, 1
#limit = 5
diff --git a/app/models/principal.rb b/app/models/principal.rb
index 0c87ec0c6..e65816e83 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -131,6 +131,22 @@ class Principal < ActiveRecord::Base
columns.uniq.map {|field| "#{table}.#{field}"}
end
+ #收藏的课程
+ def favorite_courses
+ members = Member.where("user_id = #{self.id} and course_id != -1 and is_collect = 1")
+ course_ids = members.empty? ? "(-1)" : "(" + members.map{|member| member.course_id}.join(",") + ")"
+ courses = Course.where("id in #{course_ids}")
+ return courses
+ end
+
+ #收藏的项目
+ def favorite_projects
+ members = Member.where("user_id = #{self.id} and project_id != -1 and project_id != 0 and is_collect = 1")
+ project_ids = members.empty? ? "(-1)" : "(" + members.map{|member| member.project_id}.join(",") + ")"
+ projects = Project.where("id in #{project_ids}")
+ return projects
+ end
+
protected
# Make sure we don't try to insert NULL values (see #4632)
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 78461b9ba..0335aa922 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -53,7 +53,7 @@
<% end %>
<% if User.current == user %>
- <%= link_to "取消收藏", '', :class => 'user_navmore_li',:target => '_blank' %>
+ <%= link_to "取消收藏", cancel_collect_user_path(user, :course => course.id), :class => 'user_navmore_li',:target => '_blank' %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index c4fec04df..5969f17d6 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -158,8 +158,8 @@
-
<%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
- <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
- <% all_count = @user.courses.visible.where("is_delete =?", 0).count%>
+ <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
+ <% all_count = @user.favorite_courses.visible.where("is_delete =?", 0).count%>