@@ -43,16 +43,13 @@ class UserSessionsController < Spree::BaseController end def create_user_session(data) - #delete standard user fields in case user completed both. - [:password, :login].each {|attr| data.delete attr} if user_with_openid_exists?(data) - @user_session = UserSession.new(data) @user_session.save do |result| if result respond_to do |format| format.html { flash[:notice] = t("logged_in_succesfully") - session.delete :return_to if session[:return_to] = login_path + session.delete :return_to if session[:return_to] == login_path redirect_back_or_default products_path } format.js { app/controllers/user_sessions_controller.rb @@ -9,18 +9,27 @@ class UsersController < Spree::BaseController actions :all, :except => [:index, :destroy] - create do - flash nil - success.wants.html { redirect_back_or_default products_path } - success.wants.js { render :js => true.to_json } - failure.wants.html { render :new } - failure.wants.js { render :js => @user.errors.to_json } + #Cannot use resource_controller for create action + #as openID expects block passed to user.save method + def create + @user = User.new(params[:user]) + @user.save do |result| + if result + flash[:notice] = t(:user_created_successfully) + @user.roles << Role.find_by_name("admin") unless admin_created? + respond_to do |format| + format.html { redirect_back_or_default products_url } + format.js { render :js => true.to_json } + end + else + respond_to do |format| + format.html { render :action => :new } + format.js { render :js => @user.errors.to_json } + end + end + end end - - create.after do - @user.roles << Role.find_by_name("admin") unless admin_created? - end - + show.before do @orders = @user.orders.checkout_complete end app/controllers/users_controller.rb @@ -4,6 +4,9 @@ $('#enable_login_via_openid a').click(function(){ $('div#openid-credentials').show(); $('div#openid-credentials input').removeAttr("disabled"); $('div#password-credentials').hide(); + + $('input#user_session_login').val(""); + $('input#user_session_password').val(""); }) $('#enable_login_via_login_password a').click(function(){ @@ -12,4 +15,6 @@ $('#enable_login_via_login_password a').click(function(){ $('div#openid-credentials').hide(); $('div#openid-credentials input').attr("disabled", true); $('div#password-credentials').show(); + + $('input#user_session_openid_identifier').val(""); }) public/javascripts/open_id.js ce4b8c93f62d9bdda3fff96f216107167e80504c Brian Quinn briandquinn@gmail.com http://github.com/railsdog/spree/commit/b1045568211adad778e2a7d3b18a2d31a7acade9 b1045568211adad778e2a7d3b18a2d31a7acade9 2009-11-06T10:12:20-08:00 2009-11-06T10:12:20-08:00 Changed UserController back to non r_c create action [#868 state:resolved] 3911e7567252fe86cd727810223a39ad7975ef10 Brian Quinn briandquinn@gmail.com