From 9c12680197fadeb7d936949d98b163ec6b8c92ef Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 17 Jun 2017 10:29:22 +0200 Subject: [PATCH 1/2] fixes styles for available username It was always showing red instead of green, even if the username was available --- app/assets/javascripts/registration_form.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/registration_form.js.coffee b/app/assets/javascripts/registration_form.js.coffee index b4ba32d0a..1672190c8 100644 --- a/app/assets/javascripts/registration_form.js.coffee +++ b/app/assets/javascripts/registration_form.js.coffee @@ -9,7 +9,7 @@ App.RegistrationForm = $("small").remove() showUsernameMessage = (response) -> - klass = if response.available then "error no-error" else "error error" + klass = if response.available then "no-error" else "error" usernameInput.after $("#{response.message}") validateUsername = (username) -> From 9ebc5ccf34fd73f87ad9c4c4815614990b9d4eb1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 17 Jun 2017 10:05:20 +0200 Subject: [PATCH 2/2] removes user locale validation --- app/models/user.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1b4ed81f1..219671349 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -42,9 +42,6 @@ class User < ActiveRecord::Base validates :official_level, inclusion: {in: 0..5} validates :terms_of_service, acceptance: { allow_nil: false }, on: :create - validates :locale, inclusion: {in: I18n.available_locales.map(&:to_s), - allow_nil: true} - validates_associated :organization, message: false accepts_nested_attributes_for :organization, update_only: true