From 8e3488132b07b3fb3abb7d711f8eec4a063c88d7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Jul 2016 14:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BD=9C=E4=B8=9A=EF=BC=9A?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=A2=98=E5=BA=93=E4=B8=AD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E5=8D=B4=E6=98=AF=E6=88=91=E7=9A=84=E9=A2=98=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E6=88=91=E7=9A=84=E9=A2=98=E5=BA=93=E4=B8=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=8D=B4=E6=98=AF=E5=85=AC=E5=85=B1=E9=A2=98?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 6 +++---
 app/views/users/_show_user_homeworks.html.erb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f5684f202..c870fdc3b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -709,9 +709,9 @@ class UsersController < ApplicationController
     @user = User.current
     @select_course = params[:select_course] ? 1 : 0
     #@user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
-    visible_course = Course.where("is_public = 1 && is_delete = 0")
-    visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-    @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+    courses = @user.courses.where("is_delete = 1")
+    course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
+    @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}")
     @type = params[:type]
     @limit = 15
     @is_remote = true
diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index 46e075412..f54f49865 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -1,8 +1,8 @@
 <div class="w985"> <a href="javascript:void(0);" class="popup-close" onclick="hideModal()"></a>
   <div class="f16 fb fontBlue mb10">选用题库中的题目</div>
   <div class="subject-list fl mr10">
-    <a href="<%= user_homework_type_user_path(@user,:is_import => 1) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active fl" data-remote="true">公共题库</a>
-    <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 1) %>" id="user_homeworks_choose" class="resource-tab fl" data-remote="true">我的题库</a>
+    <a href="<%= user_homework_type_user_path(@user,:is_import => 1) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active fl" data-remote="true">我的题库</a>
+    <a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 1) %>" id="user_homeworks_choose" class="resource-tab fl" data-remote="true">公共题库</a>
     <!--<a href="<%#= user_homework_type_user_path(@user,:type=>'3',:is_import => 1) %>" id="apply_homeworks_choose" class="resource-tab fl" data-remote="true">申请题库</a>-->
 
     <div id="homework_search_input">