diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-06-09 16:56:50 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-06-09 16:56:55 +0200 |
| commit | 44c2e8f507f4352f3ebec3152f5695bb071b844b (patch) | |
| tree | e60fb8783f1f80a681e047a427115e950856436e /sonar-server | |
| parent | ecf8123328306bdd3b9722e7dc71e0ef324654f1 (diff) | |
| download | sonarqube-44c2e8f507f4352f3ebec3152f5695bb071b844b.tar.gz sonarqube-44c2e8f507f4352f3ebec3152f5695bb071b844b.zip | |
SONAR-5134 Apply new rules for sorting
Diffstat (limited to 'sonar-server')
3 files changed, 17 insertions, 7 deletions
diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee index a2f288dfce8..82bb4dcb150 100644 --- a/sonar-server/src/main/coffee/coding-rules/app.coffee +++ b/sonar-server/src/main/coffee/coding-rules/app.coffee @@ -110,12 +110,20 @@ requirejs [ App.restoreSorting = (params) -> -# sort = _.findWhere(params, key: 's') || {'s': ''} -# asc = _.findWhere(params, key: 'asc') || {'asc': ''} -# if @codingRules -# @codingRules.sorting = -# sort: sort.s -# asc: asc.asc + sort = _.findWhere(params, key: 'sort') + asc = _.findWhere(params, key: 'asc') + + if (sort && asc) + @codingRules.sorting = + sort: sort.value + asc: asc.value =='true' + + + App.restoreDefaultSorting = -> + params = [] + params.push(key: 'sort', value: 'createdAt') + params.push(key: 'asc', value: false) + @restoreSorting params App.storeQuery = (query, sorting) -> @@ -259,7 +267,7 @@ requirejs [ # Define coding rules App.addInitializer -> @codingRules = new Backbone.Collection - @codingRules.sorting = sort: '', asc: '' + @restoreDefaultSorting() # Construct status bar diff --git a/sonar-server/src/main/coffee/coding-rules/router.coffee b/sonar-server/src/main/coffee/coding-rules/router.coffee index 2987e7566bd..a6f73769b20 100644 --- a/sonar-server/src/main/coffee/coding-rules/router.coffee +++ b/sonar-server/src/main/coffee/coding-rules/router.coffee @@ -22,6 +22,7 @@ define [ emptyQuery: -> + @app.restoreDefaultSorting() @index('') diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee index c26c1aafcca..296723de935 100644 --- a/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee +++ b/sonar-server/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee @@ -25,6 +25,7 @@ define [ change: (e) -> @model.set 'value', $j(e.target).val() + @options.app.codingRules.sorting = sort: '', asc: '' @options.app.fetchFirstPage() |