Use CanCanCan for messages controller

[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 48074ddd4889682be477e814483d2b1aa8f4ec8e..eb427e090848408f0a3d743de5f1c7698dc647fe 100644 (file)
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -1,13 +1,13 @@
 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
 
   def index

-    @client_applications = @user.client_applications
-    @tokens = @user.oauth_tokens.authorized
+    @client_applications = current_user.client_applications
+    @tokens = current_user.oauth_tokens.authorized

   end
 
   def new
   end
 
   def new


@@ -15,9 +15,9 @@ class OauthClientsController < ApplicationController
   end
 
   def create
   end
 
   def create

-    @client_application = @user.client_applications.build(application_params)
+    @client_application = current_user.client_applications.build(application_params)

     if @client_application.save
     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"


@@ -25,23 +25,23 @@ class OauthClientsController < ApplicationController
   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
 
   def edit
   rescue ActiveRecord::RecordNotFound
     @type = "client application"
     render :action => "not_found", :status => :not_found
   end
 
   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
 
   def update
   rescue ActiveRecord::RecordNotFound
     @type = "client application"
     render :action => "not_found", :status => :not_found
   end
 
   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 "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"


@@ -52,9 +52,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 "oauth_clients.destroy.flash"

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