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 2018/04/12 12:42:26 UTC
[ambari] branch trunk updated: AMBARI-23554 NN federation:
switching namespaces for dashboard widgets doesn't work. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6885d87 AMBARI-23554 NN federation: switching namespaces for dashboard widgets doesn't work. (ababiichuk)
6885d87 is described below
commit 6885d877de9b64304ecd3479257982a6f4fc354c
Author: aBabiichuk <ab...@hortonworks.com>
AuthorDate: Thu Apr 12 15:42:22 2018 +0300
AMBARI-23554 NN federation: switching namespaces for dashboard widgets doesn't work. (ababiichuk)
---
ambari-web/app/templates/main/dashboard/widgets.hbs | 6 ++++--
ambari-web/app/views/main/service/info/summary.js | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ambari-web/app/templates/main/dashboard/widgets.hbs b/ambari-web/app/templates/main/dashboard/widgets.hbs
index 867ac94..62d1c89 100644
--- a/ambari-web/app/templates/main/dashboard/widgets.hbs
+++ b/ambari-web/app/templates/main/dashboard/widgets.hbs
@@ -102,8 +102,10 @@
{{#each groupLayout in group.allWidgets}}
{{#if groupLayout.isActive}}
{{#each widget in groupLayout.widgets}}
- {{#if widget.isVisible}}
- {{view widget.viewClass widgetBinding="widget"}}
+ {{#if widget}}
+ {{#if widget.isVisible}}
+ {{view widget.viewClass widgetBinding="widget"}}
+ {{/if}}
{{/if}}
{{/each}}
{{/if}}
diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js
index 4113242..a501e1d 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -217,7 +217,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({
const masters = this.get('service.hostComponents').filterProperty('isMaster'),
slaves = this.get('service.slaveComponents').toArray(),
clients = this.get('service.clientComponents').toArray(),
- masterGroups = this.get('svc') ? this.get('svc.masterComponentGroups').toArray() : [];
+ masterGroups = this.get('svc.masterComponentGroups') ? this.get('svc.masterComponentGroups').toArray() : [];
if (this.get('mastersLength') !== masters.length || this.get('mastersObj.length') !== masterGroups.length) {
let mastersInit = this.get('mastersObj').mapProperty('components').reduce((acc, group) => {
--
To stop receiving notification emails like this one, please contact
ababiichuk@apache.org.