From 411ae6f89ec3165eae78bea15be3d6463fddc6d5 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 4 May 2016 11:03:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B4=B4=E5=90=A7=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=982=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/news_controller.rb       |  3 ++-
 app/controllers/users_controller.rb      |  7 +++++--
 app/views/forums/_show_topics.html.erb   |  4 +++-
 app/views/forums/show.html.erb           |  3 ---
 app/views/forums/show.js.erb             |  1 -
 app/views/layouts/new_base_user.html.erb | 10 ++++++----
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 51eb759e1..76b229dbf 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -103,7 +103,8 @@ class NewsController < ApplicationController
         end
 
         scope_order.each do |topic|
-          topic[:updated_at] = CourseActivity.where("course_act_type='#{topic.class}' and course_act_id =#{topic.id}").first.updated_at
+          topic[:updated_at] = topic.course_acts.first.updated_at
+          #topic[:updated_at] = CourseActivity.where("course_act_type='#{topic.class}' and course_act_id =#{topic.id}").first.updated_at
         end
 
         #根据 赞+回复数排序
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f67289a4b..6cc94d5a7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2858,7 +2858,9 @@ class UsersController < ApplicationController
     sort_name = "updated_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @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 #{sort_type}")
+    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*").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 a").order("a #{sort_type}")
 
     #根据 作业+资源数排序
     if @order.to_i == 2
@@ -2902,7 +2904,8 @@ class UsersController < ApplicationController
     sort_name = "updated_on"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
-    @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.select("projects.*").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}")
 
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
     if @order.to_i == 2
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index 93df27e42..08c030f90 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -29,7 +29,9 @@
             <div class="cl"></div>
           </div>
       <% end %>
-
+      <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+        <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
+      </ul>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index b0ed5a60c..2b3772734 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -41,9 +41,6 @@
   <div id="topics_list">
     <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
   </div>
-  <ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
-    <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
-  </ul>
 
   <!--<div class="pageRoll">-->
     <!--<div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>-->
diff --git a/app/views/forums/show.js.erb b/app/views/forums/show.js.erb
index 9e36215ac..48b1474cb 100644
--- a/app/views/forums/show.js.erb
+++ b/app/views/forums/show.js.erb
@@ -1,2 +1 @@
 $("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>")
-$("#pages").html('<%= pagination_links_full @topic_pages, @topic_count,:per_page_links => false,:remote =>true%>');
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 65ea3770d..e43aa499f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -346,28 +346,30 @@
   </div><!--floatbox end-->
 </div>
 <script type="text/javascript">
+    $(function(){
+        $('#user_hide_course').hide();
+        $('#user_hide_project').hide();
+    });
+
     $("#courseMenu").mouseenter(function(){
         $("#topnav_course_menu").show();
     });
     $("#courseMenu").mouseleave(function(){
         $("#topnav_course_menu").hide();
     });
-
-    $('#user_hide_course').hide();
     function leftCourseslistChange(){
         $('#homepageLeftMenuCourses').slideToggle();
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuHideIcon");
         $('#hide_show_courseicon').toggleClass("homepageLeftMenuMoreIcon");
 
     }
-
-    $('#user_hide_project').hide();
     function leftProjectslistChange(){
         $('#homepageLeftMenuForge').slideToggle();
         $('#hide_show_projecticon').toggleClass("homepageLeftMenuHideIcon");
         $('#hide_show_projecticon').toggleClass("homepageLeftMenuMoreIcon");
 
     }
+
 </script>
 </body>
 </html>