X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..4a62dac9c06bcdb7c2acac75e9168bf654c4c64d:/app/controllers/oauth_clients_controller.rb diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb index 48074ddd4..42b0921f1 100644 --- a/app/controllers/oauth_clients_controller.rb +++ b/app/controllers/oauth_clients_controller.rb @@ -1,47 +1,53 @@ 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 + + authorize_resource :class => ClientApplication 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 - @client_application = ClientApplication.new + def show + @client_application = current_user.client_applications.find(params[:id]) + rescue ActiveRecord::RecordNotFound + @type = "client application" + render :action => "not_found", :status => :not_found 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 + def new + if Settings.oauth_10_registration + @client_application = ClientApplication.new else - render :action => "new" + flash[:error] = t ".disabled" + redirect_to :action => "index" end end - def show - @client_application = @user.client_applications.find(params[:id]) + def edit + @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 - @client_application = @user.client_applications.find(params[:id]) - rescue ActiveRecord::RecordNotFound - @type = "client application" - render :action => "not_found", :status => :not_found + 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 - @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" @@ -52,9 +58,9 @@ class OauthClientsController < ApplicationController 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' + flash[:notice] = t ".flash" redirect_to :action => "index" rescue ActiveRecord::RecordNotFound @type = "client application"