zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-03 16:32:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:internetee/registry

Browse source
This commit is contained in:
Andres Keskküla 2014-12-22 10:26:54 +02:00
commit 93a1d00619
57 changed files with 441 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/ability.rb
View file

@ -22,6 +22,7 @@ class Ability
can :manage, DomainVersion
can :manage, User
can :manage, EppUser
can :manage, Keyrelay
can :index, :delayed_job
can :create, :zonefile
can :access, :settings_menu

2
app/models/epp/epp_domain.rb
View file

@ -336,7 +336,7 @@ class Epp::EppDomain < Domain
def approve_pending_transfer(current_user)
pt = pending_transfer
if current_user.registrar != pt.transfer_from
add_epp_error('2304', nil, nil, I18n.t('shared.transfer_can_be_approved_only_by_current_registrar'))
add_epp_error('2304', nil, nil, I18n.t('transfer_can_be_approved_only_by_current_registrar'))
return false
end