From b036d5b63daf595113067bb385596a735fae88b9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 13 Aug 2015 11:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E9=A6=96=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=AD=89=E9=A1=B5=E9=9D=A2header?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE/=E8=AF=BE=E7=A8=8B=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E6=8C=89=E7=85=A7=E6=9C=80=E6=96=B0=E7=9A=84=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb             |  2 +-
 app/views/layouts/_base_header.html.erb       |  2 +-
 app/views/layouts/_base_header_new.html.erb   | 10 +++++++---
 app/views/layouts/_new_header.html.erb        |  4 ++--
 app/views/layouts/_user_courses_list.html.erb |  2 +-
 app/views/layouts/_user_project_list.html.erb |  2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d82db77b2..9b9bf5f76 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1812,7 +1812,7 @@ module ApplicationHelper
   #获取用户未过期的课程
   def get_user_course user
     courses_doing = []
-    user.courses.each do |course|
+    user.courses.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").each do |course|
       if !course_endTime_timeout?(course)
         courses_doing.push course
       end
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 49c8b5499..c6ba7cf10 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -18,7 +18,7 @@
 			<ul class="sub_menu">
               <% if @show_course == 1 && !visiable %>
                 <% hasCourse=false %>
-                <% User.current.courses.each do |course| %>
+                <% User.current.courses.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").each do |course| %>
                     <% if !course_endTime_timeout?(course) %>
                           <% hasCourse=true %>
                           <% break %>
diff --git a/app/views/layouts/_base_header_new.html.erb b/app/views/layouts/_base_header_new.html.erb
index 71cf8ab02..67c750fe4 100644
--- a/app/views/layouts/_base_header_new.html.erb
+++ b/app/views/layouts/_base_header_new.html.erb
@@ -26,7 +26,7 @@
                     <li>
                       <a href="<%= url_for(:controller => 'users', :action => 'user_courses', :id=>User.current.id, :host=>Setting.host_user) %>" class="parent">我的课程</a>
                       <ul>
-                        <%  User.current.courses.each do |course| %>
+                        <%  User.current.courses.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").each do |course| %>
                           <% if !course_endTime_timeout?(course) %>
                             <li title="<%=course.name%>"><a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>course.id, :host=>Setting.host_course) %>"><%= course.name %></a>
                           <% end %>
@@ -41,8 +41,12 @@
                 <li>
                   <a href="<%= url_for(:controller => 'users', :action => 'user_projects', :id=>User.current.id, :host=>Setting.host_user) %>" class="parent">我的项目</a>
                   <ul>
-                    <% User.current.projects.each do |project| %>
-                      <li title="<%=project.name%>"><a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>project.id, :host=>Setting.host_name) %>"><%=project.name%></a></li>
+                    <% User.current.projects.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").each do |project| %>
+                      <li title="<%=project.name%>">
+                        <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>project.id, :host=>Setting.host_name) %>">
+                          <%=project.name%>
+                        </a>
+                      </li>
                     <% end %>
                   </ul>
                 </li>
diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index a756009f0..5fbf3638d 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -26,7 +26,7 @@
                         <li  id="my_courses_li">
                           <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id},target:"_blank", :class => "parent"  %>
                           <ul id="my_courses_ul">
-                            <% user_course.reverse.each do |course| %>
+                            <% user_course.each do |course| %>
                                 <li title="<%=course.name%>">
                                   <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id},target:"_blank" %>
                                 </li>
@@ -40,7 +40,7 @@
                     <li id="my_projects_li">
                       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name},target:"_blank", :class => "parent" %>
                       <ul id="my_projects_ul" >
-                        <% User.current.projects.reverse.each do |project| %>
+                        <% User.current.projects.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").each do |project| %>
                             <li title="<%=project.name%>">
                               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name }, target:"_blank" %>
                             </li>
diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb
index a5cd6f273..ce9282ee7 100644
--- a/app/views/layouts/_user_courses_list.html.erb
+++ b/app/views/layouts/_user_courses_list.html.erb
@@ -4,7 +4,7 @@
       <ul class="course_sub_menu">
         <% course_index = 0 %>
 
-        <%  User.current.courses.reverse.each do |course| %>
+        <%  User.current.courses.each do |course| %>
             <% if !course_endTime_timeout?(course) %>
                 <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
                 <% course_index += 1 %>
diff --git a/app/views/layouts/_user_project_list.html.erb b/app/views/layouts/_user_project_list.html.erb
index 4df61b01b..924bfa9d4 100644
--- a/app/views/layouts/_user_project_list.html.erb
+++ b/app/views/layouts/_user_project_list.html.erb
@@ -2,7 +2,7 @@
     <li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name} %>
       <ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
-        <% User.current.projects.reverse.each do |project| %>
+        <% User.current.projects.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").each do |project| %>
             <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
             </li>