summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-12-19 15:05:29 +0100
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-12-19 15:08:10 +0100
commit8fad708a434635a88801c7ea7977f3a3eb65dc48 (patch)
tree85614446858d1733ae79147e553a9dd1ef11bfe3
parent6a3b6365e6f80b44d42f97bf1f6140d4a8cb2090 (diff)
downloadsonarqube-8fad708a434635a88801c7ea7977f3a3eb65dc48.tar.gz
sonarqube-8fad708a434635a88801c7ea7977f3a3eb65dc48.zip
SONAR-5956 Use new parameter for "modules" criterion/facet
-rw-r--r--server/sonar-web/src/main/coffee/issues/controller.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets-view.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee2
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties2
4 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index 278afef23e3..d937228a9e8 100644
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -13,7 +13,7 @@ define [
$ = jQuery
EXTRA_FIELDS = 'actions,transitions,assigneeName,reporterName,actionPlanName'
PAGE_SIZE = 50
- ALL_FACETS = ['severities', 'statuses', 'resolutions', 'projectUuids', 'componentRootUuids', 'componentUuids', 'assignees', 'reporters', 'rules',
+ ALL_FACETS = ['severities', 'statuses', 'resolutions', 'projectUuids', 'moduleUuids', 'componentUuids', 'assignees', 'reporters', 'rules',
'tags', 'languages', 'actionPlans', 'creationDate', 'issues']
FACET_DATA_FIELDS = ['components', 'projects', 'users', 'rules', 'actionPlans', 'languages']
FACETS_FROM_SERVER = ['severities', 'statuses', 'resolutions', 'actionPlans', 'projectUuids', 'rules', 'tags'
diff --git a/server/sonar-web/src/main/coffee/issues/facets-view.coffee b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
index 2ebcca7cb3d..b030690c29b 100644
--- a/server/sonar-web/src/main/coffee/issues/facets-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets-view.coffee
@@ -47,7 +47,7 @@ define [
when 'resolutions' then ResolutionFacet
when 'creationDate' then CreationDateFacet
when 'projectUuids' then ProjectFacet
- when 'componentRootUuids' then ModuleFacet
+ when 'moduleUuids' then ModuleFacet
when 'rules' then RuleFacet
when 'tags' then TagFacet
when 'actionPlans' then ActionPlanFacet
diff --git a/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee
index 66d1a9ea1e8..2c0370db850 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/module-facet.coffee
@@ -12,7 +12,7 @@ define [
getValues: ->
- componentRoots = @options.app.state.get('query').componentRootUuids
+ componentRoots = @options.app.state.get('query').moduleUuids
componentRoots = '' unless typeof componentRoots == typeof ''
if componentRoots.length > 0
componentRoots = componentRoots.split ','
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 08e7ae9e741..bf32d5f404a 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -787,7 +787,7 @@ issues.facet.statuses=Status
issues.facet.actionPlans=Action Plan
issues.facet.assignees=Assignee
issues.facet.componentUuids=File
-issues.facet.componentRootUuids=Module
+issues.facet.moduleUuids=Module
issues.facet.tags=Tag
issues.facet.rules=Rule
issues.facet.resolutions=Resolution