ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-17860. UI does not response when try to compare AMS configs few times after Upgrade from 2.0.2 to 2.4.0.0 (alexantonenko)
Date Mon, 25 Jul 2016 11:09:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 7afbe89bf -> 810cbfa58


AMBARI-17860. UI does not response when try to compare AMS configs few times after Upgrade
from 2.0.2 to 2.4.0.0 (alexantonenko)


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

Branch: refs/heads/branch-2.4
Commit: 810cbfa58b211b16793f5bd538a2ed36204e5ac1
Parents: 7afbe89
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Jul 22 20:09:55 2016 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Mon Jul 25 14:09:30 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/views/common/configs/service_config_view.js       | 4 ++--
 .../app/views/common/configs/service_configs_by_category_view.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/810cbfa5/ambari-web/app/views/common/configs/service_config_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_config_view.js b/ambari-web/app/views/common/configs/service_config_view.js
index 5602832..d48ab16 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -87,7 +87,7 @@ App.ServiceConfigView = Em.View.extend({
    * @method updateFilterCounters
    */
   updateFilterCounters: function() {
-    if (this.get('controller.selectedService.configs')) {
+    if (this.get('controller.selectedService.configs') && this.get('state') !== 'destroyed')
{
       var categories = this.get('controller.selectedService.configCategories').mapProperty('name');
       var configsToShow = this.get('controller.selectedService.configs').filter(function(config)
{
         return config.get('isHiddenByFilter') == false && categories.contains(config.get('category'))
&& config.get('isVisible');
@@ -259,7 +259,7 @@ App.ServiceConfigView = Em.View.extend({
    * @method filterEnhancedConfigs
    */
   filterEnhancedConfigs: function () {
-    if (!this.get('controller.selectedService')) return true;
+    if (!this.get('controller.selectedService') || this.get('state') === 'destroyed') return
true;
     var self = this;
 
     var serviceConfigs = this.get('controller.selectedService.configs').filterProperty('isVisible',
true);

http://git-wip-us.apache.org/repos/asf/ambari/blob/810cbfa5/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 964e193..ad1a2f9 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
@@ -233,6 +233,7 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
   }.observes('categoryConfigs.@each.isHiddenByFilter'),
 
   collapseCategory: function () {
+    if (this.get('state') === 'destroyed') return;
     $('.popover').remove();
     var filter = this.get('parentView.filter').toLowerCase();
     var filteredResult = this.get('categoryConfigs');


Mime
View raw message