Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added model email validation.

Browse source
This commit is contained in:
Martin Edenhofer 2015-08-28 10:46:09 +02:00
parent 7e8b3adc3b
commit 6904c89668
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/models/_application_model.js.coffee
View file

@ -138,6 +138,13 @@ class App.Model extends Spine.Model
errors[attributeName] = 'didn\'t match' errors[attributeName] = 'didn\'t match'
errors["#{attributeName}_confirm"] = '' errors["#{attributeName}_confirm"] = ''
# check email
if attribute.type is 'email' && data['params'][attributeName]
if !data['params'][attributeName].match(/\S+@\S+\.\S+/)
errors[attributeName] = 'invalid'
if data['params'][attributeName].match(/ /)
errors[attributeName] = 'invalid'
# check datetime # check datetime
if attribute.tag is 'datetime' if attribute.tag is 'datetime'
if data['params'][attributeName] is 'invalid' if data['params'][attributeName] is 'invalid'

2
app/assets/javascripts/app/models/email_address.js.coffee
View file

@ -14,7 +14,7 @@ class App.EmailAddress extends App.Model
@configure_attributes = [ @configure_attributes = [
{ name: 'realname', display: 'Realname', tag: 'input', type: 'text', limit: 250, null: false }, { name: 'realname', display: 'Realname', tag: 'input', type: 'text', limit: 250, null: false },
{ name: 'email', display: 'Email', tag: 'input', type: 'email', limit: 250, null: false }, { name: 'email', display: 'Email', tag: 'input', type: 'email', limit: 250, null: false },
{ name: 'channel_id', display: 'Channel', tag: 'select', multiple: false, null: false, relation: 'Channel', nulloption: true, filter: @filterChannel }, { name: 'channel_id', display: 'Channel', tag: 'select', multiple: false, null: true, relation: 'Channel', nulloption: true, filter: @filterChannel },
{ name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true }, { name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true },
{ name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 }, { name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 },
{ name: 'active', display: 'Active', tag: 'active', default: true }, { name: 'active', display: 'Active', tag: 'active', default: true },