Browse Source

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)

Alex Antonenko 9 years ago
parent
commit
810cbfa58b

+ 2 - 2
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);

+ 1 - 0
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');