Resolve conflict

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index d4d1bd8883d942fa0e4858271f43e6acafa6e046..c7251f0a7c081f4ff23f485435f901514e73009c 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -3,7 +3,7 @@ require 'oauth/controllers/provider_controller'
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 

-  layout 'slim'
+  layout 'site'

 
   def login_required
     authorize_web
 
   def login_required
     authorize_web


@@ -32,7 +32,7 @@ class OauthController < ApplicationController
       @token.invalidate!
       flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)
     end
       @token.invalidate!
       flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)
     end

-    redirect_to :controller => 'oauth_clients', :action => 'index'
+    redirect_to oauth_clients_url(:display_name => @token.user.display_name)

   end
 
 protected
   end
 
 protected


@@ -67,10 +67,12 @@ protected
           end
         else
           @token.invalidate!
           end
         else
           @token.invalidate!

+          @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name)

           render :action => "authorize_failure"
         end
       end
     else
           render :action => "authorize_failure"
         end
       end
     else

+      @message = t "oauth.oauthorize_failure.invalid"

       render :action => "authorize_failure"
     end
   end
       render :action => "authorize_failure"
     end
   end