From 629591ad00aa1f1b5613396c99a8fab91edd7ddb Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 10 May 2016 12:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E5=8F=96?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E4=B8=AD=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb         | 12 +++++++-----
 app/views/users/_user_course_list.html.erb  |  2 +-
 app/views/users/_user_project_list.html.erb |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3001164a5..f7d965f8c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2997,10 +2997,12 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "updated_at"
+    sort_name = "updated_on"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
+    # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
+    @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 #{sort_name}").order("#{sort_name} #{sort_type}")
+
     #根据 作业+资源数排序
     if @order.to_i == 2
       @type = 2
@@ -3040,11 +3042,11 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "updated_on"
+    sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
-    # @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}")
+    #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}")
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}")
 
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
     if @order.to_i == 2
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index 212798eb1..8ef0faa9e 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -31,7 +31,7 @@
                   <span class="grayTxt">
                       创建时间：<%= format_time(course.created_at) %>
                   </span>
-                  <span class="grayTxt">更新时间：<%= format_time(course.updated_at) %></span>
+                  <span class="grayTxt">更新时间：<%= format_time(course.updated_on) %></span>
                   <span class="grayTxt">
                       开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
                   </span>
diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb
index b7b4948e4..1526da58f 100644
--- a/app/views/users/_user_project_list.html.erb
+++ b/app/views/users/_user_project_list.html.erb
@@ -28,7 +28,7 @@
               <div class="cl"></div>
               <li class="ml15">
                 <span class="grayTxt">创建时间：<%= format_time(project.created_on) %></span>
-                <span class="grayTxt">更新时间：<%= format_time(project.updated_on) %></span>
+                <span class="grayTxt">更新时间：<%= format_time(project.updated_at) %></span>
                 <p class="list-info fr grayTxt"><span><%= project.project_score.issue_num %></span><span>问题</span><span>|</span><span> <%= project.project_score.attach_num %></span><span>资源</span></p>
               </li>
               <div class="cl"></div>