From 3967b632b55d4f82fa273934388073fea92c8b18 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 1 Jun 2015 10:41:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E7=9A=84=E7=BC=93=E5=AD=98=20Signed-off-by:=20alan=20<54753343?=
 =?UTF-8?q?4@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_courses_list.html.erb | 4 ++--
 app/views/layouts/_user_project_list.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb
index 38ccf72bf..ce9282ee7 100644
--- a/app/views/layouts/_user_courses_list.html.erb
+++ b/app/views/layouts/_user_courses_list.html.erb
@@ -3,14 +3,14 @@
       <%=link_to l(:label_my_course), user_courses_user_path(User.current.id) %>
       <ul class="course_sub_menu">
         <% course_index = 0 %>
-        <% cache User.current.courses.count do%>
+
         <%  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 %>
             <% end %>
         <% end %>
-       <% end %>
+
       </ul>
     </li>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_user_project_list.html.erb b/app/views/layouts/_user_project_list.html.erb
index f7cf841f8..c70086499 100644
--- a/app/views/layouts/_user_project_list.html.erb
+++ b/app/views/layouts/_user_project_list.html.erb
@@ -2,13 +2,13 @@
     <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;">
-        <% cache User.current.projects.count do%>
+
         <% User.current.projects.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>
         <% end %>
-        <% end %>
+
       </ul>
     </li>
 <% end %>
\ No newline at end of file

From 5347d83f8fe2294ede387aea4d69a04fedfe7768 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 1 Jun 2015 12:39:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 40275a29b..aff0a975c 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -245,10 +245,10 @@ class UsersService
         "show_changesets" => true
     }
     scope = User.logged.status(status)
+    search_by = params[:search_by] ? params[:search_by] : "0"
     if params[:is_search_assitant].nil?
       #modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件(bug:#2270) start
       #say by yutao: params[:user_id]这个是指谁发起的搜索么? 如果是 这个值貌似应该从session获取 怪怪的赶脚-_-!
-      search_by = params[:search_by] ? params[:search_by] : "0"
       if params[:name].present?
         if !params[:user_id].nil?
           watcher = User.watched_by(params[:user_id])