From e7e8b644d85610c3834532abc73762c43dce15d9 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 10 Dec 2014 10:31:24 +0100 Subject: SONAR-5718 Fix sorting of facet items --- .../src/main/coffee/issues/facets/assignee-facet.coffee | 10 +++++++++- .../src/main/coffee/issues/facets/resolution-facet.coffee | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee index c5d4963d29b..7e3cc59ce32 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee @@ -64,6 +64,14 @@ define [ @options.app.state.updateFilter obj + sortValues: (values) -> + # put "unassigned" first + _.sortBy values, (v) -> + x = if v.val == '' then -999999 else -v.count + console.log v.val, x + x + + serializeData: -> _.extend super, - values: @getValuesWithLabels() + values: @sortValues @getValuesWithLabels() diff --git a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee index d70ed196386..2caed5ddb51 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee @@ -37,6 +37,6 @@ define [ sortValues: (values) -> - order = ['FIXED', 'FALSE-POSITIVE', 'CLOSED'] + order = ['', 'FIXED', 'FALSE-POSITIVE', 'REMOVED'] _.sortBy values, (v) -> order.indexOf v.val -- cgit v1.2.3