Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/services/courses_service.rb

@@ -38,7 +38,7 @@ class CoursesService
     if name.blank?
       raise 'sumbit empty'
     end
-    @courses = courses_all.visible
+    @courses = courses_all.visible(current_user)
     if params[:name].present?
       @courses_all = @courses.like(params[:name])
     else

app/services/users_service.rb

@@ -193,7 +193,6 @@ class UsersService
       @current_user.save
         #raise @current_user.errors.full_message
         #return @current_user
-
     else
       raise 'wrong password'
     end