summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-06-05 15:11:37 +0200
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-06-05 15:11:49 +0200
commit3997684e743741660d111653e04606f9704ea87f (patch)
treec4423f3134373a5bc030583bed726ac053c0b465
parente4509eda2a570f5231b4bee5f026df4023dbb242 (diff)
downloadsonarqube-3997684e743741660d111653e04606f9704ea87f.tar.gz
sonarqube-3997684e743741660d111653e04606f9704ea87f.zip
SONAR-5134 Add option to sort by relevance (aka using default sort from server)
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties1
-rw-r--r--sonar-server/src/main/coffee/coding-rules/app.coffee6
-rw-r--r--sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs1
3 files changed, 5 insertions, 3 deletions
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 304dfe79bd8..157bc670a71 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1804,6 +1804,7 @@ coding_rules.facets.repositories=Repositories
coding_rules.sort.creation_date=Creation Date
coding_rules.sort.name=Name
+coding_rules.sort.relevance=Relevance
#------------------------------------------------------------------------------
#
diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee
index c1b4282eb46..344ed3f03cf 100644
--- a/sonar-server/src/main/coffee/coding-rules/app.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/app.coffee
@@ -111,7 +111,7 @@ requirejs [
App.storeQuery = (query, sorting) ->
- if sorting
+ if sorting && sorting.sort
_.extend query,
s: sorting.sort
asc: '' + sorting.asc
@@ -127,7 +127,7 @@ requirejs [
if @codingRulesFacetsView
_.extend fetchQuery, @codingRulesFacetsView.getQuery()
- if @codingRules.sorting
+ if @codingRules.sorting && @codingRules.sorting.sort
_.extend fetchQuery,
s: @codingRules.sorting.sort,
asc: @codingRules.sorting.asc
@@ -242,7 +242,7 @@ requirejs [
# Define coding rules
App.addInitializer ->
@codingRules = new Backbone.Collection
- @codingRules.sorting = sort: 'createdAt', asc: false
+ @codingRules.sorting = sort: '', asc: ''
# Construct status bar
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
index 9b4a83e4d67..a170f69a602 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
@@ -6,6 +6,7 @@
{{/if}}
</div>
<ul class="navigator-actions-order-choices">
+ <li data-sort="" data-asc="">{{t 'coding_rules.sort.relevance'}}</li>
<li data-sort="createdAt" data-asc="true">{{t 'coding_rules.sort.creation_date'}} <i class="icon-sort-asc"></i></li>
<li data-sort="createdAt" data-asc="false">{{t 'coding_rules.sort.creation_date'}} <i class="icon-sort-desc"></i></li>
<li data-sort="name" data-asc="true">{{t 'coding_rules.sort.name'}} <i class="icon-sort-asc"></i></li>