From 74e77bf3475c116b1c20f291fdf7df8f4aadc9c4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Mar 2016 16:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=9A=84=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=8F=AF=E7=94=A8=20=E9=A2=98?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=88=86=E5=B8=83=E6=97=B6=E9=97=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 63155e25a..9039fd041 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -573,7 +573,7 @@ class UsersController < ApplicationController
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     search = params[:name].to_s.strip.downcase
-    type_ids = params[:property]=="" ? "(1, 2, 3)" : "(" + params[:property] + ")"
+    type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")"
         if(params[:type].blank? || params[:type] == "1") #全部
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb
index 99e6d4e27..678bf65d7 100644
--- a/app/views/users/_homework_repository_list.html.erb
+++ b/app/views/users/_homework_repository_list.html.erb
@@ -25,9 +25,9 @@
     <% end%>
   </li>
   <li class="fl subject-list-date">
-    <%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "fl",:remote => true%>
-    <% if @order == "created_at"%>
-        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "created_at", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
+    <%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "fl",:remote => true%>
+    <% if @order == "publish_time"%>
+        <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
     <% end%>
   </li>
 </ul>