Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6D68610E4A for ; Wed, 25 Jun 2014 17:46:14 +0000 (UTC) Received: (qmail 28636 invoked by uid 500); 25 Jun 2014 17:46:14 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 28615 invoked by uid 500); 25 Jun 2014 17:46:14 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 28606 invoked by uid 99); 25 Jun 2014 17:46:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2014 17:46:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3CD6198B0A8; Wed, 25 Jun 2014 17:46:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akovalenko@apache.org To: commits@ambari.apache.org Message-Id: <5e7b7de15f054dfc9e5aaed2d737cc59@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-6272. Add Service wizard shouldn't show Save Configs popup on deploy. (akovalenko) Date: Wed, 25 Jun 2014 17:46:12 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-1.6.1 709649cef -> 26512c884 AMBARI-6272. Add Service wizard shouldn't show Save Configs popup on deploy. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/26512c88 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26512c88 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26512c88 Branch: refs/heads/branch-1.6.1 Commit: 26512c8846e4f0e8077b393376c00b48d1b4ed3d Parents: 709649c Author: Aleksandr Kovalenko Authored: Wed Jun 25 20:45:30 2014 +0300 Committer: Aleksandr Kovalenko Committed: Wed Jun 25 20:45:40 2014 +0300 ---------------------------------------------------------------------- .../app/controllers/main/service/info/configs.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/26512c88/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index e119397..92a2519 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -818,7 +818,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ "hosts": groupHosts, "desired_configs": this.buildGroupDesiredConfigs(overridenConfigs) } - }); + }, true); } }, @@ -1057,18 +1057,23 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ }, /** * persist properties of config groups to server - * @param data + * show result popup if showPopup is true + * @param data {Object} + * @param showPopup {Boolean} */ - putConfigGroupChanges: function (data) { - App.ajax.send({ + putConfigGroupChanges: function (data, showPopup) { + var ajaxOptions = { name: 'config_groups.update_config_group', sender: this, data: { id: data.ConfigGroup.id, configGroup: data - }, - success: "putConfigGroupChangesSuccess" - }); + } + }; + if (showPopup) { + ajaxOptions.success = "putConfigGroupChangesSuccess"; + } + App.ajax.send(ajaxOptions); }, putConfigGroupChangesSuccess: function () {