aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-05-05 10:36:09 +0200
committerStas Vilchik <vilchiks@gmail.com>2015-05-05 10:36:09 +0200
commit39707810c59036f0ff64ded7ff50044f4906d23a (patch)
tree39a2ab74a8401d70bf5cd15bdfd7bf09777b6d0a /server
parentfafb1f05739f94bb846d3f7cd8f5663147b281d8 (diff)
downloadsonarqube-39707810c59036f0ff64ded7ff50044f4906d23a.tar.gz
sonarqube-39707810c59036f0ff64ded7ff50044f4906d23a.zip
SONAR-5851 apply feedback
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/js/quality-profiles/controller.js1
-rw-r--r--server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js1
-rw-r--r--server/sonar-web/src/test/js/quality-profiles.js3
3 files changed, 4 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/js/quality-profiles/controller.js b/server/sonar-web/src/main/js/quality-profiles/controller.js
index 87c481b4436..b3fabdd04d0 100644
--- a/server/sonar-web/src/main/js/quality-profiles/controller.js
+++ b/server/sonar-web/src/main/js/quality-profiles/controller.js
@@ -111,6 +111,7 @@ define([
this.options.app.router.navigate('');
this.options.app.layout.headerRegion.reset();
this.options.app.layout.detailsRegion.reset();
+ this.options.app.profilesView.highlight(null);
},
fetchProfiles: function () {
diff --git a/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js b/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js
index 4285a6bf8d3..3d86785c579 100644
--- a/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js
+++ b/server/sonar-web/src/main/js/quality-profiles/restore-built-in-profiles-view.js
@@ -57,6 +57,7 @@ define([
}
}).done(function () {
that.collection.fetch({ reset: true });
+ that.collection.trigger('destroy');
that.close();
}).fail(function (jqXHR) {
that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
diff --git a/server/sonar-web/src/test/js/quality-profiles.js b/server/sonar-web/src/test/js/quality-profiles.js
index 50042e42ce2..56aa831f751 100644
--- a/server/sonar-web/src/test/js/quality-profiles.js
+++ b/server/sonar-web/src/test/js/quality-profiles.js
@@ -815,7 +815,7 @@ casper.test.begin(testName('Importers'), 6, function (test) {
});
-casper.test.begin(testName('Restore Built-in Profiles'), 2, function (test) {
+casper.test.begin(testName('Restore Built-in Profiles'), 3, function (test) {
casper
.start(lib.buildUrl('profiles'), function () {
lib.setDefaultViewport();
@@ -861,6 +861,7 @@ casper.test.begin(testName('Restore Built-in Profiles'), 2, function (test) {
.then(function () {
test.assertSelectorContains('.js-list .list-group-item', 'Sonar way');
+ test.assertDoesntExist('.search-navigator-header-component');
})
.then(function () {