You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2017/02/17 22:56:47 UTC
[09/51] [abbrv] ambari git commit: AMBARI-19862. JS error on host
configs page (onechiporenko)
AMBARI-19862. JS error on host configs page (onechiporenko)
(cherry picked from commit 5262ebeaf276fa3f2ba49ebaeabcb7ffb3c0ccf5)
Change-Id: I20448a2576a4f004aaa68b2c97d26a97b9b83d9b
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/218371c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/218371c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/218371c8
Branch: refs/heads/branch-feature-BUG-74026
Commit: 218371c86a68ecf2171d633ede238abec709e5af
Parents: 8ffb989
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Feb 3 10:47:11 2017 +0200
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Feb 6 21:29:34 2017 -0800
----------------------------------------------------------------------
.../app/views/common/configs/service_configs_by_category_view.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/218371c8/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index d9b4409..f4f35c8 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -70,7 +70,7 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
*/
mainView: function () {
//todo: Get rid of this logic. Get data from controller instead.
- return this.get('controller.name') === 'mainServiceInfoConfigsController' ? this.get('parentView.parentView') : this.get('parentView');
+ return ['mainHostServiceConfigsController', 'mainServiceInfoConfigsController'].contains(this.get('controller.name')) ? this.get('parentView.parentView') : this.get('parentView');
}.property('controller.name'),
didInsertElement: function () {