Merge remote-tracking branch 'upstream/pull/4440'

[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 bf55679e87b170bbc7177e8d4178340f5150c523..44dacde6d72a4ce3a19eb7732eedea58d7c13f7d 100644 (file)
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -1,47 +1,48 @@
 class OauthClientsController < ApplicationController
   layout "site"
 
 class OauthClientsController < ApplicationController
   layout "site"
 

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

 
 

-  def index
-    @client_applications = @user.client_applications
-    @tokens = @user.oauth_tokens.authorized
-  end
+  authorize_resource :class => ClientApplication

 
 

-  def new
-    @client_application = ClientApplication.new
-  end
-
-  def create
-    @client_application = @user.client_applications.build(application_params)
-    if @client_application.save
-      flash[:notice] = t "oauth_clients.create.flash"
-      redirect_to :action => "show", :id => @client_application.id
-    else
-      render :action => "new"
-    end
+  def index
+    @client_applications = current_user.client_applications
+    @tokens = current_user.oauth_tokens.authorized

   end
 
   def show
   end
 
   def show

-    @client_application = @user.client_applications.find(params[:id])
+    @client_application = current_user.client_applications.find(params[:id])

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

+  def new
+    @client_application = ClientApplication.new
+  end
+

   def edit
   def edit

-    @client_application = @user.client_applications.find(params[:id])
+    @client_application = current_user.client_applications.find(params[:id])

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

+  def create
+    @client_application = current_user.client_applications.build(application_params)
+    if @client_application.save
+      flash[:notice] = t ".flash"
+      redirect_to :action => "show", :id => @client_application.id
+    else
+      render :action => "new"
+    end
+  end
+

   def update
   def update

-    @client_application = @user.client_applications.find(params[:id])
-    if @client_application.update_attributes(application_params)
-      flash[:notice] = t "oauth_clients.update.flash"
+    @client_application = current_user.client_applications.find(params[:id])
+    if @client_application.update(application_params)
+      flash[:notice] = t ".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"


@@ -52,9 +53,9 @@ class OauthClientsController < ApplicationController
   end
 
   def destroy
   end
 
   def destroy

-    @client_application = @user.client_applications.find(params[:id])
+    @client_application = current_user.client_applications.find(params[:id])

     @client_application.destroy
     @client_application.destroy

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

     redirect_to :action => "index"
   rescue ActiveRecord::RecordNotFound
     @type = "client application"
     redirect_to :action => "index"
   rescue ActiveRecord::RecordNotFound
     @type = "client application"