Use Faraday in place of Net::HTTP so we can mock responses

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

diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb
index 320dab1b527521fb66cf3dc8bf7f3463de05db6e..1c1877ad4e3414e140bcda772482a3efa56fc751 100644 (file)
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -1,9 +1,9 @@
 class OauthClientsController < ApplicationController
 class OauthClientsController < ApplicationController

-  layout 'site'
+  layout "site"

 
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :require_user

 
   def index
     @client_applications = @user.client_applications
 
   def index
     @client_applications = @user.client_applications


@@ -17,7 +17,7 @@ class OauthClientsController < ApplicationController
   def create
     @client_application = @user.client_applications.build(application_params)
     if @client_application.save
   def create
     @client_application = @user.client_applications.build(application_params)
     if @client_application.save

-      flash[:notice] = t'oauth_clients.create.flash'
+      flash[:notice] = t "oauth_clients.create.flash"

       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "new"
       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "new"


@@ -41,7 +41,7 @@ class OauthClientsController < ApplicationController
   def update
     @client_application = @user.client_applications.find(params[:id])
     if @client_application.update_attributes(application_params)
   def update
     @client_application = @user.client_applications.find(params[:id])
     if @client_application.update_attributes(application_params)

-      flash[:notice] = t'oauth_clients.update.flash'
+      flash[:notice] = t "oauth_clients.update.flash"

       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "edit"
       redirect_to :action => "show", :id => @client_application.id
     else
       render :action => "edit"


@@ -54,13 +54,15 @@ class OauthClientsController < ApplicationController
   def destroy
     @client_application = @user.client_applications.find(params[:id])
     @client_application.destroy
   def destroy
     @client_application = @user.client_applications.find(params[:id])
     @client_application.destroy

-    flash[:notice] = t'oauth_clients.destroy.flash'
+    flash[:notice] = t "oauth_clients.destroy.flash"

     redirect_to :action => "index"
   rescue ActiveRecord::RecordNotFound
     @type = "client application"
     render :action => "not_found", :status => :not_found
   end
     redirect_to :action => "index"
   rescue ActiveRecord::RecordNotFound
     @type = "client application"
     render :action => "not_found", :status => :not_found
   end

-private
+
+  private
+

   def application_params
     params.require(:client_application).permit(:name, :url, :callback_url, :support_url, ClientApplication.all_permissions)
   end
   def application_params
     params.require(:client_application).permit(:name, :url, :callback_url, :support_url, ClientApplication.all_permissions)
   end