From a8169c4353042ca939e0598770911e8b00a6844e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 24 Jul 2017 16:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=8F=AD=E7=BA=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=86=E9=A1=B5=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.xml                              | 12 ++++++------
 app/controllers/users_controller.rb                |  4 ++--
 app/views/users/_my_homepage_courses_list.html.erb |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 934f79cf7..37b752e8c 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -28,25 +28,25 @@
     <data-source source="LOCAL" name="Rails bigdata: production" uuid="a2967bb5-941b-447d-ba0e-5e62ade5fb7d">
       <driver-ref>mysql</driver-ref>
       <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://127.0.0.1/0604new</jdbc-url>
+      <jdbc-url>jdbc:mysql://127.0.0.1/trustie</jdbc-url>
       <user-name>root</user-name>
-      <user-password>df9bdf98df99df9e</user-password>
+      <user-password>dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd</user-password>
       <libraries />
     </data-source>
     <data-source source="LOCAL" name="Rails bigdata: development" uuid="ea7cc5a3-1ef5-4a23-93bb-2c9650c10d07">
       <driver-ref>mysql</driver-ref>
       <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://127.0.0.1/20161227data</jdbc-url>
+      <jdbc-url>jdbc:mysql://127.0.0.1/trustie</jdbc-url>
       <user-name>root</user-name>
-      <user-password>df9bdf98df99df9e</user-password>
+      <user-password>dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd</user-password>
       <libraries />
     </data-source>
     <data-source source="LOCAL" name="Rails bigdata: test" uuid="9f93a163-6133-42ac-a16d-9bd67f458fd6">
       <driver-ref>mysql</driver-ref>
       <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://127.0.0.1/0623newblank</jdbc-url>
+      <jdbc-url>jdbc:mysql://127.0.0.1/trustie</jdbc-url>
       <user-name>root</user-name>
-      <user-password>df9bdf98df99df9e</user-password>
+      <user-password>dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd</user-password>
       <libraries />
     </data-source>
   </component>
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f995eb275..104bed29b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2258,9 +2258,9 @@ class UsersController < ApplicationController
       @shixuns = paginateHelper @shixuns, @limit
     elsif params[:index] == "course"
       if params[:filter] == "manage"
-        @courses = @user.courses.not_deleted_not_end.select{ |course| @user.has_teacher_role(course)}.order("updated_at desc")
+        @courses = @user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| @user.has_teacher_role(course)}
       elsif params[:filter] == "join"
-        @courses = @user.courses.not_deleted_not_end.select{ |course| !@user.has_teacher_role(course)}.order("updated_at desc")
+        @courses = @user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| !@user.has_teacher_role(course)}
       elsif params[:filter] == "all"
         @courses = @user.courses.not_deleted_not_end.order("updated_at desc")
       end
diff --git a/app/views/users/_my_homepage_courses_list.html.erb b/app/views/users/_my_homepage_courses_list.html.erb
index 1f8c031f0..1d5724e99 100644
--- a/app/views/users/_my_homepage_courses_list.html.erb
+++ b/app/views/users/_my_homepage_courses_list.html.erb
@@ -20,7 +20,7 @@
 <%# if @courses_count > 8 %>
       <!--<a href="<%#= courses_path %>" target="_blank" class="font-16 new_expand">点击查看全部</a>-->
 <%# end %>
-      <% if @courses_count > 8 %>
+      <% if @courses_count > 5 %>
           <div class="cl"></div>
           <div style="text-align:center;" class="new_expand">
             <div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">