X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c2432ae423c6744b8443c63d0e02e1ccc2d3011..4a1f0da82349888796ba2c0c52868228f0fa9c70:/app/controllers/oauth_clients_controller.rb diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb index b925002ec..42b0921f1 100644 --- a/app/controllers/oauth_clients_controller.rb +++ b/app/controllers/oauth_clients_controller.rb @@ -11,20 +11,6 @@ class OauthClientsController < ApplicationController @tokens = current_user.oauth_tokens.authorized end - def new - @client_application = ClientApplication.new - end - - def create - @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 - else - render :action => "new" - end - end - def show @client_application = current_user.client_applications.find(params[:id]) rescue ActiveRecord::RecordNotFound @@ -32,6 +18,15 @@ class OauthClientsController < ApplicationController render :action => "not_found", :status => :not_found end + def new + if Settings.oauth_10_registration + @client_application = ClientApplication.new + else + flash[:error] = t ".disabled" + redirect_to :action => "index" + end + end + def edit @client_application = current_user.client_applications.find(params[:id]) rescue ActiveRecord::RecordNotFound @@ -39,10 +34,20 @@ class OauthClientsController < ApplicationController 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 @client_application = current_user.client_applications.find(params[:id]) if @client_application.update(application_params) - flash[:notice] = t "oauth_clients.update.flash" + flash[:notice] = t ".flash" redirect_to :action => "show", :id => @client_application.id else render :action => "edit" @@ -55,7 +60,7 @@ class OauthClientsController < ApplicationController def destroy @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"