You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/02/03 19:30:54 UTC

ambari git commit: AMBARI-9460. Alerts: Email alert notification should accept multiple recipients

Repository: ambari
Updated Branches:
  refs/heads/trunk c895c8a76 -> dac9200e7


AMBARI-9460. Alerts: Email alert notification should accept multiple recipients


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dac9200e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dac9200e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dac9200e

Branch: refs/heads/trunk
Commit: dac9200e75d89714be470f9796ed21e7e94be477
Parents: c895c8a
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue Feb 3 10:25:20 2015 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Feb 3 10:25:20 2015 -0800

----------------------------------------------------------------------
 .../manage_alert_notifications_controller.js    | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/dac9200e/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 be8c3e9..995f2ae 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
@@ -384,14 +384,20 @@ App.ManageAlertNotificationsController = Em.Controller.extend({
         }.observes('controller.inputFields.name.value'),
 
         emailToValidation: function () {
-          var emailTo = this.get('controller.inputFields.email.value');
-          if (emailTo && !validator.isValidEmail(emailTo)) {
-            this.set('emailToError', true);
-            this.set('controller.inputFields.email.errorMsg', Em.I18n.t('alerts.notifications.error.email'));
-          } else {
-            this.set('emailToError', false);
-            this.set('controller.inputFields.email.errorMsg', null);
+          var inputValue = this.get('controller.inputFields.email.value').trim(),
+              emailsTo = inputValue.split(','),
+              emailToError = false,
+              i = emailsTo.length,
+              emailTo;
+          while (i--) {
+            emailTo = emailsTo[i];
+            if (emailTo && !validator.isValidEmail(emailTo.trim())) {
+              emailToError = true;
+              break;
+            }
           }
+          this.set('emailToError', emailToError);
+          this.set('controller.inputFields.email.errorMsg', emailToError ? Em.I18n.t('alerts.notifications.error.email') : null);
         }.observes('controller.inputFields.email.value'),
 
         emailFromValidation: function () {