From: Stas Vilchik Date: Mon, 14 Sep 2015 13:33:43 +0000 (+0200) Subject: SONAR-5851 fix bug with duplicated languages in the list X-Git-Tag: 5.2-RC1~405 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=03f7f009068ff824a48c52aaf5cd5ccd34b3b5e3;p=sonarqube.git SONAR-5851 fix bug with duplicated languages in the list --- diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/profiles-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/profiles-view.js index 677888f451c..321e2a2a7d6 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/profiles-view.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/profiles-view.js @@ -67,8 +67,8 @@ define([ compositeView._insertAfter(childView); }, - closeChildren: function () { - Marionette.CompositeView.prototype.closeChildren.apply(this, arguments); + destroyChildren: function () { + Marionette.CompositeView.prototype.destroyChildren.apply(this, arguments); this.$('.js-list-language').remove(); }, diff --git a/server/sonar-web/test/medium/quality-profiles.spec.js b/server/sonar-web/test/medium/quality-profiles.spec.js index cecc574ed3e..1d89f75ad33 100644 --- a/server/sonar-web/test/medium/quality-profiles.spec.js +++ b/server/sonar-web/test/medium/quality-profiles.spec.js @@ -355,6 +355,7 @@ define(function (require) { .mockFromFile('/api/languages/list', 'quality-profiles/languages.json') .startApp('quality-profiles', { urlRoot: '/test/medium/base.html' }) .checkElementExist('.js-list .list-group-item') + .checkElementCount('.js-list .js-list-language', 1) .checkElementCount('.js-list .list-group-item', 1) .clickElement('#quality-profiles-actions') .clickElement('#quality-profiles-restore-built-in') @@ -364,6 +365,7 @@ define(function (require) { .mockFromFile('/api/qualityprofiles/search', 'quality-profiles/search.json') .fillElement('#restore-built-in-profiles-language', 'java') .clickElement('#restore-built-in-profiles-submit') + .checkElementCount('.js-list .js-list-language', 4) .checkElementCount('.js-list .list-group-item', 5) .checkElementInclude('.js-list .list-group-item', 'Sonar way') .checkElementNotExist('.search-navigator-header-component');