Update Potlatch 2 to 2.0-2-g954c74a build

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 631c91035f0e8661a83513716efe436e72f2e80b..649c0c9078792afc184c4961cbda6a0ef8c77094 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,5 +1,5 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-  layout 'site', :except => :api_details
+  layout :choose_layout

 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]


@@ -53,9 +53,18 @@ class UserController < ApplicationController
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
     elsif params[:decline]
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
     elsif params[:decline]

-      @user.terms_seen = true
-      @user.save
-      redirect_to t('user.terms.declined')
+      if @user
+        @user.terms_seen = true
+        @user.save
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => :account, :display_name => @user.display_name
+        end
+      else
+        redirect_to t('user.terms.declined')
+      end

     elsif @user
       if !@user.terms_agreed?
         @user.consider_pd = params[:user][:consider_pd]
     elsif @user
       if !@user.terms_agreed?
         @user.consider_pd = params[:user][:consider_pd]


@@ -66,7 +75,11 @@ class UserController < ApplicationController
         end
       end
 
         end
       end
 

-      redirect_to :action => :account, :display_name => @user.display_name
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :action => :account, :display_name => @user.display_name
+      end

     else
       @user = User.new(params[:user])
 
     else
       @user = User.new(params[:user])
 


@@ -82,9 +95,9 @@ class UserController < ApplicationController
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
         session[:token] = @user.tokens.create.token
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
         session[:token] = @user.tokens.create.token

-        redirect_to :action => 'login'
+        redirect_to :action => 'login', :referer => params[:referer]

       else
       else

-        render :action => 'new'
+        render :action => 'new', :referer => params[:referer]

       end
     end
   end
       end
     end
   end


@@ -218,19 +231,20 @@ class UserController < ApplicationController
         session[:user] = user.id
         session_expires_after 1.month if params[:remember_me]
 
         session[:user] = user.id
         session_expires_after 1.month if params[:remember_me]
 

-        # if the user hasn't seen the contributor terms then redirect them
-        # to that page.
+        target = params[:referer] || url_for(:controller => :site, :action => :index)
+
+        # The user is logged in, so decide where to send them:
+        #
+        # - If they haven't seen the contributor terms, send them there.
+        # - If they have a block on them, show them that.
+        # - If they were referred to the login, send them back there.
+        # - Otherwise, send them to the home page.

         if REQUIRE_TERMS_SEEN and not user.terms_seen
         if REQUIRE_TERMS_SEEN and not user.terms_seen

-          redirect_to :controller => 'user', :action => 'terms', :referer => params[:referer]
-        # The user is logged in, if the referer param exists, redirect
-        # them to that unless they've also got a block on them, in
-        # which case redirect them to the block so they can clear it.
+          redirect_to :controller => :user, :action => :terms, :referer => target

         elsif user.blocked_on_view
         elsif user.blocked_on_view

-          redirect_to user.blocked_on_view, :referer => params[:referer]
-        elsif params[:referer]
-          redirect_to params[:referer]
+          redirect_to user.blocked_on_view, :referer => target

         else
         else

-          redirect_to :controller => 'site', :action => 'index'
+          redirect_to target

         end
       elsif user = User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
         flash.now[:error] = t 'user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name)
         end
       elsif user = User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
         flash.now[:error] = t 'user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name)


@@ -482,4 +496,17 @@ private
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end

+
+  ##
+  # Choose the layout to use. See
+  # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
+  def choose_layout
+    if [ 'api_details' ].include? action_name
+      nil
+    elsif params[:referer] == url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+      'slim'
+    else
+      'site'
+    end
+  end

 end
 end