Merge remote-tracking branch 'origin/szzh' into guange_dev

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])

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 %>