diff options
author | jessib <jessib@riseup.net> | 2013-07-16 12:49:48 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-07-16 12:49:48 -0700 |
commit | 97bd0ba4b35481216b2a1592065c70562c81c2d5 (patch) | |
tree | 036760e5427bbb32360cf9eb3ccbe80159d62695 /users/app | |
parent | bf5922d26e27ee9695b07eade42d36a34b63fc4e (diff) | |
parent | 8486248a7a960bc75f25f2c5a00791416f124ac4 (diff) |
Merge pull request #60 from azul/bugfix/srp-fix-for-zeroprefixed-hashes
Bugfix/srp fix for zeroprefixed hashes
Diffstat (limited to 'users/app')
m--------- | users/app/assets/javascripts/srp | 0 | ||||
-rw-r--r-- | users/app/assets/javascripts/users.js | 4 | ||||
-rw-r--r-- | users/app/models/token.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp -Subproject 926a5d5960db51903e33c8496487da59f9f4124 +Subproject 9c61d52f1f975ec0eefe5b4a0b71ac529300cbe diff --git a/users/app/assets/javascripts/users.js b/users/app/assets/javascripts/users.js index 65bed4f..4c9b510 100644 --- a/users/app/assets/javascripts/users.js +++ b/users/app/assets/javascripts/users.js @@ -49,12 +49,12 @@ for (field in message.errors) { if (field == 'base') { alert_message(message.errors[field]); - next; + continue; } error = message.errors[field]; element = $('form input[name$="[' + field + ']"]'); if (!element) { - next; + continue; } element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false); } diff --git a/users/app/models/token.rb b/users/app/models/token.rb index 44a6dfe..cc62778 100644 --- a/users/app/models/token.rb +++ b/users/app/models/token.rb @@ -8,7 +8,7 @@ class Token < CouchRest::Model::Base def initialize(*args) super - self.id = SecureRandom.urlsafe_base64(32) + self.id = SecureRandom.urlsafe_base64(32).gsub(/^_*/, '') end design do |