zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 01:47:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Validate e-mail when country is other than estonia

Browse source
This commit is contained in:
Martin Lensment 2014-09-30 12:55:21 +03:00
parent 0dc0cc63d9
commit 42b1890bf5
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/admin/users_controller.rb
View file

@ -14,10 +14,10 @@ class Admin::UsersController < AdminController
@user = User.new(user_params) @user = User.new(user_params)
if @user.save if @user.save
flash[:notice] = I18n.t('shared.user_added') flash[:notice] = I18n.t('shared.record_created')
redirect_to [:admin, @user] redirect_to [:admin, @user]
else else
flash.now[:alert] = I18n.t('shared.failed_to_add_user') flash.now[:alert] = I18n.t('shared.failed_to_create_record')
render 'new' render 'new'
end end
end end
@ -36,6 +36,16 @@ class Admin::UsersController < AdminController
end end
end end
def destroy
if @user.destroy
flash[:notice] = I18n.t('shared.record_deleted')
redirect_to admin_users_path
else
flash.now[:alert] = I18n.t('shared.failed_to_delete_record')
render 'show'
end
end
private private
def set_user def set_user

5
app/models/user.rb
View file

@ -12,8 +12,9 @@ class User < ActiveRecord::Base
validates :username, :password, presence: true validates :username, :password, presence: true
validates :identity_code, uniqueness: true, allow_blank: true validates :identity_code, uniqueness: true, allow_blank: true
validates :identity_code, presence: true, if: -> { country.iso == 'EE' && identity_code.blank? } validates :identity_code, presence: true, if: -> { country.iso == 'EE' }
validates :registrar, presence: true, if: -> { !admin && !registrar } validates :email, presence: true, if: -> { country.iso == 'LV' }
validates :registrar, presence: true, if: -> { !admin }
before_save -> { self.registrar = nil if admin? } before_save -> { self.registrar = nil if admin? }

4
config/locales/en.yml
View file

@ -356,5 +356,9 @@ en:
edit_user: 'Edit user' edit_user: 'Edit user'
back_to_user: 'Back to user' back_to_user: 'Back to user'
record_created: 'Record created'
failed_to_create_record: 'Failed to create record'
record_updated: 'Record updated' record_updated: 'Record updated'
failed_to_update_record: 'Failed to update record' failed_to_update_record: 'Failed to update record'
record_deleted: 'Record deleted'
failed_to_delete_record: 'Failed to delete record'

1
db/seeds.rb
View file

@ -7,6 +7,7 @@
# Mayor.create(name: 'Emanuel', city: cities.first) # Mayor.create(name: 'Emanuel', city: cities.first)
Country.where(name: 'Estonia', iso: 'EE').first_or_create Country.where(name: 'Estonia', iso: 'EE').first_or_create
Country.where(name: 'Latvia', iso: 'LV').first_or_create
zone = Registrar.where( zone = Registrar.where(
name: 'Zone Media OÜ', name: 'Zone Media OÜ',