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

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

Browse source 
Conflicts:
	app/models/nameserver.rb
This commit is contained in:
Andres Keskküla 2014-10-20 16:42:35 +03:00
commit dd8410248e
12 changed files with 113 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/client/domain_transfers_controller.rb
View file

@ -28,7 +28,7 @@ class Client::DomainTransfersController < ClientController
end
@domain_transfer = @domain.domain_transfers.create(domain_transfer_params)
@domain_transfer.approve_as_server if SettingGroup.domain_general.setting(:transfer_wait_time).value.to_i == 0
@domain_transfer.approve_as_server if Setting.transfer_wait_time == 0
if @domain_transfer.approved?
flash[:notice] = I18n.t('shared.domain_transfer_approved')