From 7513205c9f91d3dd651d5d741562c2ccfed22c4f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 15 Jun 2015 08:24:19 +0200 Subject: [PATCH 1/2] Fixed selector for toggle. --- .../javascripts/app/controllers/_channel/email.js.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_channel/email.js.coffee b/app/assets/javascripts/app/controllers/_channel/email.js.coffee index e92e35e97..b822f97d0 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.js.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.js.coffee @@ -411,8 +411,8 @@ class App.ChannelEmailInboundEdit extends App.ControllerModal class App.ChannelEmailOutbound extends App.Controller events: - 'change #_adapter': 'toggle' - 'submit #mail_adapter': 'update' + 'change [name="adapter"]': 'toggle' + 'submit #mail_adapter': 'update' constructor: -> super From 4b110cc751590276c1384cc3842dcea274402ce0 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 15 Jun 2015 08:55:52 +0200 Subject: [PATCH 2/2] Fixed validation. --- app/assets/javascripts/app/models/channel.js.coffee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/models/channel.js.coffee b/app/assets/javascripts/app/models/channel.js.coffee index dc528c970..334c18409 100644 --- a/app/assets/javascripts/app/models/channel.js.coffee +++ b/app/assets/javascripts/app/models/channel.js.coffee @@ -6,10 +6,10 @@ class App.Channel extends App.Model @configure_attributes = [ { name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: { IMAP: 'IMAP', POP3: 'POP3' } }, - { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, - { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false }, - { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false }, - { name: 'options::ssl', display: 'SSL', tag: 'select', multiple: false, null: false, options: { true: 'yes', false: 'no' }, translate: true, default: true}, + { name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false }, + { name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false }, + { name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false }, + { name: 'options::ssl', display: 'SSL', tag: 'select', multiple: false, null: true, options: { true: 'yes', false: 'no' }, translate: true, default: true}, { name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false }, { name: 'group_id', display: 'Group', tag: 'select', multiple: false, null: false, nulloption: true, relation: 'Group' }, { name: 'active', display: 'Active', tag: 'select', multiple: false, null: false, options: { true: 'yes', false: 'no' }, translate: true, default: true },