app/views/shared/_nav_bar.html.erb @@ -27,14 +27,14 @@ class UserSessionsController < Spree::BaseController redirect_to products_path end - def login_bar - render :partial => "shared/login_bar" + def nav_bar + render :partial => "shared/nav_bar" end private def user_with_openid_exists?(data) - data && data[:openid_identifier] && + data && !data[:openid_identifier].blank? && !!User.find(:first, :conditions => ["openid_identifier LIKE ?", "%#{data[:openid_identifier]}%"]) end @@ -43,12 +43,16 @@ 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 redirect_back_or_default products_path } format.js { @@ -74,7 +78,7 @@ class UserSessionsController < Spree::BaseController @user.save do |result| if result flash[:notice] = t(:user_created_successfully) - redirect_back_or_default account_url + redirect_back_or_default products_url else flash[:notice] = t(:missing_required_information) redirect_to :controller => :users, :action => :new, :user => {:openid_identifier => @user.openid_identifier} app/controllers/user_sessions_controller.rb @@ -8,20 +8,19 @@ class UsersController < Spree::BaseController ssl_required :new, :create, :edit, :update, :show actions :all, :except => [:index, :destroy] - - 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? - redirect_back_or_default account_url - else - render :action => :new - end - end - end - + + 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 } + 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 @@ -16,11 +16,7 @@ end <div id="header" class="container"> <div id="login-bar"> <ul id="nav-bar"> - <li><%= render 'shared/search' %></li> - <%= render 'shared/login_bar' %> - <% if store_menu? %> - <%= render 'shared/store_menu' %> - <% end %> + <%= render 'shared/nav_bar' %> </ul> </div> <%= logo %> app/views/layouts/spree_application.html.erb @@ -25,7 +25,7 @@ ActionController::Routing::Routes.draw do |map| map.root :controller => "products", :action => "index" - map.resource :user_session, :member => {:login_bar => :get} + map.resource :user_session, :member => {:nav_bar => :get} map.resource :account, :controller => "users" map.resources :password_resets config/routes.rb @@ -420,13 +420,13 @@ var submit_confirmation = function() { // update login partial var update_login = function() { $.ajax({ - url: '/user_session/login_bar', + url: '/user_session/nav_bar', beforeSend : function (xhr) { xhr.setRequestHeader('Accept-Encoding', 'identity'); }, dataType: "html", success: function(result) { - $("div#login-bar").html(result); + $("ul#nav-bar").html(result); }, error: function (XMLHttpRequest, textStatus, errorThrown) { // TODO (maybe do nothing) public/javascripts/checkout.js 31f18e1c3a2a13155afeae55db0c8abda9ff72f6 Brian Quinn briandquinn@gmail.com http://github.com/railsdog/spree/commit/23f740c95bfb1d7f6202b1ad9bf9ce39d1a18ced 23f740c95bfb1d7f6202b1ad9bf9ce39d1a18ced 2009-11-06T02:10:41-08:00 2009-11-06T02:10:41-08:00 Fixes problems with checkout when creating new user, and cleans up some OpenID issues. [#868 state:resolved] 741e9e5b67f18e5bdfff076405d6e99296bd32e4 Brian Quinn briandquinn@gmail.com