zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 01:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed country depricated

Browse source
This commit is contained in:
Priit Tark 2015-05-08 14:35:09 +03:00
parent 08cb700069
commit 66c9e5d66b
4 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/registrar/sessions_controller.rb
View file

@ -9,6 +9,7 @@ class Registrar::SessionsController < ::SessionsController
@depp_user = Depp::User.new @depp_user = Depp::User.new
end end
# rubocop:disabled Metrics/PerceivedComplexity
def create def create
@depp_user = Depp::User.new(params[:depp_user].merge( @depp_user = Depp::User.new(params[:depp_user].merge(
pki: request.env['HTTP_SSL_CLIENT_S_DN_CN'].present? pki: request.env['HTTP_SSL_CLIENT_S_DN_CN'].present?
@ -32,6 +33,7 @@ class Registrar::SessionsController < ::SessionsController
render 'login' render 'login'
end end
end end
# rubocop:enabled Metrics/PerceivedComplexity
def login_mid def login_mid
@user = User.new @user = User.new

1
app/models/address.rb
View file

@ -1,6 +1,5 @@
class Address < ActiveRecord::Base class Address < ActiveRecord::Base
include Versions # version/address_version.rb include Versions # version/address_version.rb
belongs_to :country_deprecated, foreign_key: :country_id
LOCAL_TYPE_SHORT = 'loc' LOCAL_TYPE_SHORT = 'loc'
INTERNATIONAL_TYPE_SHORT = 'int' INTERNATIONAL_TYPE_SHORT = 'int'

1
app/models/admin_user.rb
View file

@ -5,7 +5,6 @@ class AdminUser < User
validates :email, presence: true validates :email, presence: true
validate :validate_identity_code, if: -> { country_code == 'EE' } validate :validate_identity_code, if: -> { country_code == 'EE' }
belongs_to :country_deprecated, foreign_key: :country_id
ROLES = %w(user customer_service admin) ROLES = %w(user customer_service admin)

2
app/models/registrar.rb
View file

@ -10,8 +10,6 @@ class Registrar < ActiveRecord::Base
has_many :nameservers, through: :domains has_many :nameservers, through: :domains
has_many :whois_records has_many :whois_records
belongs_to :country_deprecated, foreign_key: :country_id
validates :name, :reg_no, :country_code, :email, :code, presence: true validates :name, :reg_no, :country_code, :email, :code, presence: true
validates :name, :reg_no, :reference_no, :code, uniqueness: true validates :name, :reg_no, :reference_no, :code, uniqueness: true
validate :forbidden_codes validate :forbidden_codes