aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main
diff options
context:
space:
mode:
authorDavid Gageot <david@gageot.net>2012-07-12 16:13:15 +0200
committerDavid Gageot <david@gageot.net>2012-07-12 17:21:01 +0200
commitb5f52d01f06c94bd179e6eba6c86180199734735 (patch)
tree2ffe9ba15be9913cb27a5aa473539739edf52aba /sonar-server/src/main
parent99be026f67711291551d178d13040f7417825c67 (diff)
downloadsonarqube-b5f52d01f06c94bd179e6eba6c86180199734735.tar.gz
sonarqube-b5f52d01f06c94bd179e6eba6c86180199734735.zip
SONAR-3510 Select a view or a developer when adding a widget to a global dashboard
Diffstat (limited to 'sonar-server/src/main')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb16
1 files changed, 13 insertions, 3 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
index dd53bcf1c55..d19fe776114 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
@@ -25,10 +25,20 @@ module WidgetPropertiesHelper
end
def resource_value_field(value)
- projects = Project.all(:conditions => {:scope => 'PRJ', :qualifier => 'TRK', :enabled => true})
- sorted_projects = Api::Utils.insensitive_sort(projects, &:name)
+ combo = ''
- select_tag 'resource_id', options_id(value, sorted_projects)
+ visible_qualifiers=Java::OrgSonarServerUi::JRubyFacade.getInstance().getQualifiersWithProperty('supportsGlobalDashboards')
+
+ visible_qualifiers.each do |qualifier|
+ projects = Project.all(:conditions => {:qualifier => qualifier, :enabled => true})
+
+ unless projects.nil? || projects.empty?
+ sorted_projects = Api::Utils.insensitive_sort(projects, &:name)
+ combo += option_group(message('qualifiers.' + qualifier), options_id(value, sorted_projects))
+ end
+ end
+
+ select_tag 'resource_id', combo
end
end