add dir="auto" to search fields

[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 1c1877ad4e3414e140bcda772482a3efa56fc751..b925002ec7bed7278e19055c719c52092fec30d8 100644 (file)
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -3,11 +3,12 @@ class OauthClientsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

-  before_action :require_user
+
+  authorize_resource :class => ClientApplication

 
   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,7 +16,7 @@ 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
       flash[:notice] = t "oauth_clients.create.flash"
       redirect_to :action => "show", :id => @client_application.id
     if @client_application.save
       flash[:notice] = t "oauth_clients.create.flash"
       redirect_to :action => "show", :id => @client_application.id


@@ -25,22 +26,22 @@ 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)
+    @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
       flash[:notice] = t "oauth_clients.update.flash"
       redirect_to :action => "show", :id => @client_application.id
     else


@@ -52,7 +53,7 @@ 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
     flash[:notice] = t "oauth_clients.destroy.flash"
     redirect_to :action => "index"
     @client_application.destroy
     flash[:notice] = t "oauth_clients.destroy.flash"
     redirect_to :action => "index"