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

Fix empty hash issue #2962

Browse source
This commit is contained in:
Martin Lensment 2015-09-24 11:55:18 +03:00 • committed by Rene Vahtel
parent d9c2b992d2
commit b448313850
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/reserved_domains_controller.rb
View file

@ -3,13 +3,15 @@ class Admin::ReservedDomainsController < AdminController
def index def index
rd = ReservedDomain.first_or_initialize rd = ReservedDomain.first_or_initialize
@reserved_domains = rd.names.to_yaml.gsub("---\n", '') rd.names = nil if rd.names.blank?
@reserved_domains = rd.names.to_yaml.gsub(/---.?\n/, '').gsub(/\.\.\..?\n/, '')
end end
def create def create
@reserved_domains = params[:reserved_domains] @reserved_domains = params[:reserved_domains]
begin begin
params[:reserved_domains] = "---\n" if params[:reserved_domains].blank?
names = YAML.load(params[:reserved_domains]) names = YAML.load(params[:reserved_domains])
fail if names == false fail if names == false
rescue rescue

1
app/models/reserved_domain.rb
View file

@ -3,6 +3,7 @@ class ReservedDomain < ActiveRecord::Base
before_save :fill_empty_passwords before_save :fill_empty_passwords
def fill_empty_passwords def fill_empty_passwords
return unless names
names.each { |k, v| names[k] = SecureRandom.hex if v.blank? } names.each { |k, v| names[k] = SecureRandom.hex if v.blank? }
end end