aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-11-17 09:21:58 +0100
committerStas Vilchik <vilchiks@gmail.com>2015-11-17 09:21:58 +0100
commitaef7ab9d126129f9e6382c1f06eb46cfb5565d8f (patch)
tree2971bc0a193a816ea411c40e0c4930375b595e56
parent86945db962de1082a537a2ce97bcc66263c30586 (diff)
downloadsonarqube-aef7ab9d126129f9e6382c1f06eb46cfb5565d8f.tar.gz
sonarqube-aef7ab9d126129f9e6382c1f06eb46cfb5565d8f.zip
SONAR-6932 Make it possible to hide comparison results of quality profiles
-rw-r--r--server/sonar-web/src/main/js/apps/quality-profiles/profile-comparison-view.js8
-rw-r--r--server/sonar-web/src/main/js/apps/quality-profiles/profile.js6
-rw-r--r--server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profile-comparison.hbs4
3 files changed, 16 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/profile-comparison-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/profile-comparison-view.js
index 17217c5921a..d6fad9764fe 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/profile-comparison-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/profile-comparison-view.js
@@ -6,7 +6,8 @@ export default Marionette.ItemView.extend({
template: Template,
events: {
- 'submit #quality-profile-comparison-form': 'onFormSubmit'
+ 'submit #quality-profile-comparison-form': 'onFormSubmit',
+ 'click .js-hide-comparison': 'onHideComparisonClick'
},
onRender: function () {
@@ -22,6 +23,11 @@ export default Marionette.ItemView.extend({
this.model.compareWith(withKey);
},
+ onHideComparisonClick: function (e) {
+ e.preventDefault();
+ this.model.resetComparison();
+ },
+
getProfilesForComparison: function () {
var profiles = this.model.collection.toJSON(),
key = this.model.id,
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/profile.js b/server/sonar-web/src/main/js/apps/quality-profiles/profile.js
index 955cb2546a7..73ace102b13 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/profile.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/profile.js
@@ -86,7 +86,6 @@ export default Backbone.Model.extend({
});
},
-
resetChangelog: function () {
this.unset('events', { silent: true });
this.unset('eventsPage', { silent: true });
@@ -108,6 +107,11 @@ export default Backbone.Model.extend({
comparedWith: withKey
});
});
+ },
+
+ resetComparison: function () {
+ this.unset('comparedWith', { silent: true });
+ this.unset('comparison');
}
});
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profile-comparison.hbs b/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profile-comparison.hbs
index 0f920b43361..e34ee3e4d00 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profile-comparison.hbs
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profile-comparison.hbs
@@ -82,4 +82,8 @@
{{/each}}
{{/notEmpty}}
</table>
+
+ <p class="spacer-top text-center">
+ <a class="js-hide-comparison" href="#">{{t 'hide'}}</a>
+ </p>
{{/notNull}}