Repository: ambari Updated Branches: refs/heads/trunk af5372656 -> 6110665c6
AMBARI-9226. Alerts: "Use authentication" checked but should not be Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6110665c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6110665c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6110665c Branch: refs/heads/trunk Commit: 6110665c6ab2e126492e40d6ff99f2e3edf62b31 Parents: af53726 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Thu Jan 22 11:15:46 2015 -0800 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Thu Jan 22 13:44:43 2015 -0800 ---------------------------------------------------------------------- .../main/alerts/manage_alert_notifications_controller.js | 4 ++-- .../main/alerts/manage_alert_notifications_controller_test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6110665c/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js index bc03905..be8c3e9 100644 --- a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js +++ b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js @@ -290,11 +290,11 @@ App.ManageAlertNotificationsController = Em.Controller.extend({ selectedAlertNotification.get('properties')['ambari.dispatch.recipients'].join(', ') : ''); inputFields.set('SMTPServer.value', selectedAlertNotification.get('properties')['mail.smtp.host']); inputFields.set('SMTPPort.value', selectedAlertNotification.get('properties')['mail.smtp.port']); - inputFields.set('SMTPUseAuthentication.value', selectedAlertNotification.get('properties')['mail.smtp.auth']); + inputFields.set('SMTPUseAuthentication.value', selectedAlertNotification.get('properties')['mail.smtp.auth'] !== "false"); inputFields.set('SMTPUsername.value', selectedAlertNotification.get('properties')['ambari.dispatch.credential.username']); inputFields.set('SMTPPassword.value', selectedAlertNotification.get('properties')['ambari.dispatch.credential.password']); inputFields.set('retypeSMTPPassword.value', selectedAlertNotification.get('properties')['ambari.dispatch.credential.password']); - inputFields.set('SMTPSTARTTLS.value', selectedAlertNotification.get('properties')['mail.smtp.starttls.enable']); + inputFields.set('SMTPSTARTTLS.value', selectedAlertNotification.get('properties')['mail.smtp.starttls.enable'] !== "false"); inputFields.set('emailFrom.value', selectedAlertNotification.get('properties')['mail.smtp.from']); inputFields.set('version.value', selectedAlertNotification.get('properties')['ambari.dispatch.snmp.version']); inputFields.set('OIDs.value', selectedAlertNotification.get('properties')['ambari.dispatch.snmp.oids.trap']); http://git-wip-us.apache.org/repos/asf/ambari/blob/6110665c/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js b/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js index 9f3c498..054dcd5 100644 --- a/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js +++ b/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js @@ -296,7 +296,7 @@ describe('App.ManageAlertNotificationsController', function () { value: '25' }, SMTPUseAuthentication: { - value: "true" + value: true }, SMTPUsername: { value: 'user' @@ -308,7 +308,7 @@ describe('App.ManageAlertNotificationsController', function () { value: 'pass' }, SMTPSTARTTLS: { - value: "true" + value: true }, emailFrom: { value: 'from'
