jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
huang 2015-03-19 10:44:24 +08:00
parent 371f25b61f 5a1492964a
commit f5b528dc4d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/courses_service.rb
View File

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

1
app/services/users_service.rb
View File

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