diff options
| author | Azul <azul@leap.se> | 2012-11-26 10:59:50 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-26 10:59:50 +0100 |
| commit | ce0999ead0d61db1f6534ee9d8114c4551542e80 (patch) | |
| tree | 40600388d20ecda99a23ec89c15ee715450ff824 /users | |
| parent | 76a3b91ad78d12ef82a0c01ca702720a510f1e22 (diff) | |
minor: client side validations fixed + .json request
Diffstat (limited to 'users')
| -rw-r--r-- | users/app/assets/javascripts/users.js.coffee | 2 | ||||
| -rw-r--r-- | users/app/models/user.rb | 8 | ||||
| -rw-r--r-- | users/app/views/users/_form.html.haml | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee index 5663161..f0bb3dd 100644 --- a/users/app/assets/javascripts/users.js.coffee +++ b/users/app/assets/javascripts/users.js.coffee @@ -15,7 +15,7 @@ srp.updated = -> srp.error = (message) -> if $.isPlainObject(message) && message.errors for field, error of message.errors - element = $('form input[name="session['+field+']"]') + element = $('form input[name$="['+field+']"]') next unless element element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false) else diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 624754b..39d079a 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -9,7 +9,8 @@ class User < CouchRest::Model::Base :presence => true validates :login, - :uniqueness => true + :uniqueness => true, + :if => :serverside? validates :login, :format => { :with => /\A[A-Za-z\d_]+\z/, @@ -74,4 +75,9 @@ class User < CouchRest::Model::Base def password password_verifier end + + # used as a condition for validations that are server side only + def serverside? + true + end end diff --git a/users/app/views/users/_form.html.haml b/users/app/views/users/_form.html.haml index d26d17d..fc835af 100644 --- a/users/app/views/users/_form.html.haml +++ b/users/app/views/users/_form.html.haml @@ -1,5 +1,5 @@ - html = {:class => 'form-horizontal user form ' + (@user.new_record? ? 'new' : 'edit')} -= simple_form_for @user, :validate => true, :html => html do |f| += simple_form_for @user, :validate => true, :format => :json, :html => html do |f| %legend = @user.new_record? ? t(:signup_message) : t(:edit_settings) = f.input :login, :input_html => { :id => :srp_username } |