Merge pull request #83 from internetee/111396946-blocked_and_reserved_view

111396946 blocked and reserved view
This commit is contained in:
Timo Võhmar 2016-02-10 17:20:55 +02:00
commit bd4477f962
14 changed files with 308 additions and 93 deletions

View file

@ -2,6 +2,7 @@ class BlockedDomain < ActiveRecord::Base
include Versions
before_save :generate_data
before_destroy :remove_data
validates :name, domain_name: true, uniqueness: true
class << self

View file

@ -3,6 +3,9 @@ class ReservedDomain < ActiveRecord::Base
before_save :fill_empty_passwords
before_save :generate_data
before_destroy :remove_data
validates :name, domain_name: true, uniqueness: true
class << self
@ -22,7 +25,12 @@ class ReservedDomain < ActiveRecord::Base
def fill_empty_passwords
self.password = SecureRandom.hex unless self.password
if self.password.empty?
self.password = SecureRandom.hex
end
end
def name= val