ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-19862. JS error on host configs page (onechiporenko)
Date Fri, 03 Feb 2017 09:51:12 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 25499712d -> 5262ebeaf


AMBARI-19862. JS error on host configs page (onechiporenko)


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

Branch: refs/heads/branch-2.5
Commit: 5262ebeaf276fa3f2ba49ebaeabcb7ffb3c0ccf5
Parents: 2549971
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Fri Feb 3 10:47:11 2017 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Fri Feb 3 11:51:07 2017 +0200

----------------------------------------------------------------------
 .../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/5262ebea/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 () {


Mime
View raw message