diff --git a/Gemfile b/Gemfile index 78ef06e14d..c4b195731e 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,6 @@ gem 'selectize-rails', '0.12.1' # include selectize.js for select # view helpers gem 'kaminari', '0.16.3' # pagination gem 'coderay', '1.1.0' # xml console visualize -gem 'html5_validators', '1.2.2' # model requements now automatically on html form gem 'select2-rails', '3.5.9.3' # for autocomplete gem 'liquid', '3.0.6' # for email templates diff --git a/Gemfile.lock b/Gemfile.lock index 8100f7c7c8..4a2cea8e53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,7 +205,6 @@ GEM haml (~> 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - html5_validators (1.2.2) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) @@ -467,7 +466,6 @@ DEPENDENCIES grape haml-rails (= 0.9.0) html2haml (= 2.1.0) - html5_validators (= 1.2.2) isikukood iso8601 (= 0.8.6) jbuilder (= 2.2.16) diff --git a/app/models/billing/price.rb b/app/models/billing/price.rb index 559c53f832..b48c9f0bb7 100644 --- a/app/models/billing/price.rb +++ b/app/models/billing/price.rb @@ -2,8 +2,6 @@ module Billing class Price < ActiveRecord::Base include Concerns::Billing::Price::Expirable - self.auto_html5_validation = false - belongs_to :zone, class_name: 'DNS::Zone', required: true has_many :account_activities diff --git a/app/models/concerns/disable_html5_validation.rb b/app/models/concerns/disable_html5_validation.rb deleted file mode 100644 index 0c1c90eb50..0000000000 --- a/app/models/concerns/disable_html5_validation.rb +++ /dev/null @@ -1,9 +0,0 @@ -module DisableHtml5Validation - extend ActiveSupport::Concern - - class_methods do - def auto_html5_validation - false - end - end -end diff --git a/app/models/deposit.rb b/app/models/deposit.rb index 2eff26bcca..5943f15400 100644 --- a/app/models/deposit.rb +++ b/app/models/deposit.rb @@ -2,7 +2,6 @@ class Deposit include ActiveModel::Validations include ActiveModel::Conversion extend ActiveModel::Naming - include DisableHtml5Validation attr_accessor :description, :registrar, :registrar_id attr_writer :amount diff --git a/app/models/depp/contact.rb b/app/models/depp/contact.rb index e9cd4d3c9d..2d85d14592 100644 --- a/app/models/depp/contact.rb +++ b/app/models/depp/contact.rb @@ -1,7 +1,6 @@ module Depp class Contact include ActiveModel::Model - include DisableHtml5Validation attr_accessor :id, :name, :email, :phone, :org_name, :ident, :ident_type, :ident_country_code, diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb index fb5f619234..0c8351c975 100644 --- a/app/models/depp/domain.rb +++ b/app/models/depp/domain.rb @@ -2,7 +2,6 @@ module Depp class Domain include ActiveModel::Conversion extend ActiveModel::Naming - include DisableHtml5Validation attr_accessor :name, :current_user, :epp_xml diff --git a/app/models/depp/keyrelay.rb b/app/models/depp/keyrelay.rb index 8e8eaec263..a528bab2fc 100644 --- a/app/models/depp/keyrelay.rb +++ b/app/models/depp/keyrelay.rb @@ -1,6 +1,5 @@ module Depp class Keyrelay - include DisableHtml5Validation attr_accessor :current_user, :epp_xml def initialize(args = {}) diff --git a/app/models/depp/user.rb b/app/models/depp/user.rb index 482c32462a..babbd28688 100644 --- a/app/models/depp/user.rb +++ b/app/models/depp/user.rb @@ -3,7 +3,6 @@ class User include ActiveModel::Validations include ActiveModel::Conversion extend ActiveModel::Naming - include DisableHtml5Validation attr_accessor :tag, :password, :pki diff --git a/app/models/dns/zone.rb b/app/models/dns/zone.rb index ac9c891f8c..a63d9b2804 100644 --- a/app/models/dns/zone.rb +++ b/app/models/dns/zone.rb @@ -1,7 +1,5 @@ module DNS class Zone < ActiveRecord::Base - self.auto_html5_validation = false - validates :origin, :ttl, :refresh, :retry, :expire, :minimum_ttl, :email, :master_nameserver, presence: true validates :ttl, :refresh, :retry, :expire, :minimum_ttl, numericality: { only_integer: true } validates :origin, uniqueness: true diff --git a/app/views/registrant/sessions/login_mid.haml b/app/views/registrant/sessions/login_mid.haml index 54a30fd3d6..318e190331 100644 --- a/app/views/registrant/sessions/login_mid.haml +++ b/app/views/registrant/sessions/login_mid.haml @@ -2,8 +2,7 @@ .form-signin.col-md-4.center-block.text-center %h2.form-signin-heading.text-center= t '.header' %hr - = form_for @user, url: registrant_mid_path, auto_html5_validation: false, - html: {class: 'form-signin'} do |f| + = form_for @user, url: registrant_mid_path, html: {class: 'form-signin'} do |f| = f.text_field :phone, class: 'form-control', placeholder: t(:phone_no), autocomplete: 'off', required: true %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t '.submit_btn' diff --git a/app/views/registrar/sessions/login_mid.haml b/app/views/registrar/sessions/login_mid.haml index 0b27564e52..7ee6042098 100644 --- a/app/views/registrar/sessions/login_mid.haml +++ b/app/views/registrar/sessions/login_mid.haml @@ -2,8 +2,7 @@ .form-signin.col-md-4.center-block.text-center %h2.form-signin-heading.text-center= t '.header' %hr - = form_for @user, url: registrar_mid_path, auto_html5_validation: false, - html: {class: 'form-signin'} do |f| + = form_for @user, url: registrar_mid_path, html: {class: 'form-signin'} do |f| = f.text_field :phone, class: 'form-control', placeholder: t(:phone_no), autocomplete: 'off', required: true %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t '.submit_btn'