spec/dummy/app/controllers/application_controller.rb in enju_bookmark-0.0.5 vs spec/dummy/app/controllers/application_controller.rb in enju_bookmark-0.0.6
- old
+ new
@@ -46,10 +46,10 @@
if request.get? and request.format.try(:html?) and !request.xhr?
session[:user_return_to] = request.fullpath
end
end
- def get_user_if_nil
+ def get_user
@user = User.where(:username => params[:user_id]).first if params[:user_id]
#authorize! :show, @user if @user
end
def solr_commit