You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/01/06 11:14:42 UTC
ambari git commit: AMBARI-14560 Installer wizard: "Configure
Services" page shows infinite spinner. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 5ff2ae9a2 -> 37e5c1335
AMBARI-14560 Installer wizard: "Configure Services" page shows infinite spinner. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37e5c133
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37e5c133
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37e5c133
Branch: refs/heads/trunk
Commit: 37e5c13350c3d2aaf64f4cdd176495c545a5e411
Parents: 5ff2ae9
Author: ababiichuk <ab...@hortonworks.com>
Authored: Wed Jan 6 09:04:10 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Wed Jan 6 10:25:41 2016 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 6 ++++++
.../templates/common/modal_popups/dependent_configs_list.hbs | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e5c133/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 1cc852f..71e6b66 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -180,6 +180,12 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
return serviceNames;
}.property('content.services').cacheable(),
+ installedServices: function () {
+ return App.StackService.find().toArray().toMapByCallback('serviceName', function (item) {
+ return Em.get(item, 'isInstalled');
+ });
+ }.property(),
+
/**
* List of master components
* @type {Ember.Enumerable}
http://git-wip-us.apache.org/repos/asf/ambari/blob/37e5c133/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
index fb3cbc5..0fe073c 100644
--- a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
+++ b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
@@ -54,7 +54,7 @@
</td>
<td class="config-dependency-recommended-value">
{{#if recommendation.isDeleted}}
- <i>{{t recommendation.removed}}</i>
+ <i>{{t common.removed}}</i>
{{else}}
{{recommendation.recommendedValue}}
{{/if}}