mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 09:57:23 +02:00
Fix cancan form submit
This commit is contained in:
parent
028ca94d49
commit
96eead47b7
4 changed files with 27 additions and 10 deletions
|
@ -3,6 +3,12 @@ class ApplicationController < ActionController::Base
|
||||||
# For APIs, you may want to use :null_session instead.
|
# For APIs, you may want to use :null_session instead.
|
||||||
protect_from_forgery with: :exception
|
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)
|
def after_sign_in_path_for(resource)
|
||||||
if resource.admin?
|
if resource.admin?
|
||||||
(session[:user_return_to].nil?) ? admin_root_path : session[:user_return_to].to_s
|
(session[:user_return_to].nil?) ? admin_root_path : session[:user_return_to].to_s
|
||||||
|
|
|
@ -46,6 +46,16 @@ class Client::DomainsController < ClientController
|
||||||
end
|
end
|
||||||
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
|
private
|
||||||
|
|
||||||
def domain_params
|
def domain_params
|
||||||
|
@ -74,6 +84,6 @@ class Client::DomainsController < ClientController
|
||||||
def verify_deletion
|
def verify_deletion
|
||||||
return if @domain.can_be_deleted?
|
return if @domain.can_be_deleted?
|
||||||
flash[:alert] = I18n.t('shared.domain_status_prohibits_deleting')
|
flash[:alert] = I18n.t('shared.domain_status_prohibits_deleting')
|
||||||
redirect_to [:admin, @domain]
|
redirect_to [:client, @domain]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,10 +3,10 @@ class Ability
|
||||||
|
|
||||||
def initialize(user)
|
def initialize(user)
|
||||||
|
|
||||||
# user ||= EppUser.last
|
user ||= User.new
|
||||||
if user.admin?
|
if user.admin?
|
||||||
can :manage, Domain
|
can :manage, Domain
|
||||||
else
|
elsif user.persisted?
|
||||||
can :manage, Domain, registrar_id: user.registrar.id
|
can :manage, Domain, registrar_id: user.registrar.id
|
||||||
can :read, DomainTransfer, transfer_to_id: user.registrar.id
|
can :read, DomainTransfer, transfer_to_id: user.registrar.id
|
||||||
can :approve_as_client, DomainTransfer, transfer_from_id: user.registrar.id, status: DomainTransfer::PENDING
|
can :approve_as_client, DomainTransfer, transfer_from_id: user.registrar.id, status: DomainTransfer::PENDING
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
||||||
= javascript_include_tag 'application', 'data-turbolinks-track' => true
|
= javascript_include_tag 'application', 'data-turbolinks-track' => true
|
||||||
%link{href: "../../favicon.ico", rel: "icon"}/
|
%link{href: "../../favicon.ico", rel: "icon"}/
|
||||||
%title EPP Client
|
%title= t('shared.eedirekt')
|
||||||
%body
|
%body
|
||||||
/ Static navbar
|
/ Static navbar
|
||||||
.navbar.navbar-inverse.navbar-static-top{role: "navigation"}
|
.navbar.navbar-inverse.navbar-static-top{role: "navigation"}
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
%span.icon-bar
|
%span.icon-bar
|
||||||
%span.icon-bar
|
%span.icon-bar
|
||||||
%span.icon-bar
|
%span.icon-bar
|
||||||
= link_to 'EPP Client', client_domains_path, class: 'navbar-brand'
|
= link_to t('shared.eedirekt'), client_domains_path, class: 'navbar-brand'
|
||||||
.navbar-collapse.collapse
|
.navbar-collapse.collapse
|
||||||
%ul.nav.navbar-nav
|
%ul.nav.navbar-nav
|
||||||
%li.dropdown.active
|
%li.dropdown.active
|
||||||
|
@ -44,8 +44,9 @@
|
||||||
= link_to t('shared.check'), '#'
|
= link_to t('shared.check'), '#'
|
||||||
%li
|
%li
|
||||||
= link_to t('shared.register'), '#'
|
= link_to t('shared.register'), '#'
|
||||||
|
- if current_user.admin?
|
||||||
%li
|
%li
|
||||||
= link_to 'Admin', '/'
|
= link_to 'Admin', admin_root_path
|
||||||
%ul.nav.navbar-nav.navbar-right
|
%ul.nav.navbar-nav.navbar-right
|
||||||
%li= link_to t('shared.log_out'), '/logout'
|
%li= link_to t('shared.log_out'), '/logout'
|
||||||
/ /.nav-collapse
|
/ /.nav-collapse
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue