zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-02 17:23:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix cancan form submit

Browse source
This commit is contained in:
Martin Lensment 2014-09-26 10:29:34 +03:00
parent 028ca94d49
commit 96eead47b7
4 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application_controller.rb
View file

@ -3,6 +3,12 @@ class ApplicationController < ActionController::Base
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
before_filter do
resource = controller_name.singularize.to_sym
method = "#{resource}_params"
params[resource] &&= send(method) if respond_to?(method, true)
end
def after_sign_in_path_for(resource)
if resource.admin?
(session[:user_return_to].nil?) ? admin_root_path : session[:user_return_to].to_s

18
app/controllers/client/domains_controller.rb
View file

@ -1,7 +1,7 @@
class Client::DomainsController < ClientController
load_and_authorize_resource
before_action :set_domain, only: [:show, :edit, :update, :destroy]
before_action :verify_deletion, only: [:destroy]
load_and_authorize_resource
before_action :set_domain, only: [:show, :edit, :update, :destroy]
before_action :verify_deletion, only: [:destroy]
def index
@q = Domain.search(params[:q]) if current_user.admin?
@ -46,6 +46,16 @@ class Client::DomainsController < ClientController
end
end
def destroy
if @domain.destroy
flash[:notice] = I18n.t('shared.domain_deleted')
redirect_to client_domains_path
else
flash[:alert] = I18n.t('shared.failed_to_delete_domain')
redirect_to [:client, @domain]
end
end
private
def domain_params
@ -74,6 +84,6 @@ class Client::DomainsController < ClientController
def verify_deletion
return if @domain.can_be_deleted?
flash[:alert] = I18n.t('shared.domain_status_prohibits_deleting')
redirect_to [:admin, @domain]
redirect_to [:client, @domain]
end
end