diff options
| author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-07-10 11:36:42 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-07-10 11:36:42 +0200 |
| commit | 74877b46aababea529125b83f4fa12b98cee6af7 (patch) | |
| tree | 2b35998a3a6bc2b8f279fa233395e585ddf2f014 | |
| parent | 118ae7d21966b15666b5d40e47f103c5d412ec70 (diff) | |
| download | sonarqube-74877b46aababea529125b83f4fa12b98cee6af7.tar.gz sonarqube-74877b46aababea529125b83f4fa12b98cee6af7.zip | |
The projects that can be selected in the issues sidebar should only be TRK projects
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb | 5 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb index 747f8c4464e..646d692c1aa 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb @@ -3,10 +3,7 @@ issues = issues_result.issues max_page_size_reached = issues_result.issues.size >= issues_result.paging.pageSize() - project_key = nil - if issues_result.projects().to_a.size == 1 - project_key = issues_result.project(issues.to_a.first).key unless issues.empty? - end + project_key = issues_result.project(issues.to_a.first).key if !issues.empty? && issues_result.projects().to_a.size == 1 transitions_by_issues = {} unresolved_issues = 0 diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb index c400c02e72e..bb7714d86f4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb @@ -15,12 +15,15 @@ <li id="criteria-project" class="marginbottom5"> <%= message 'issue_filter.criteria.project' -%>: <% selected_componentRoot = Internal.component_api.findByKey(@issues_query.componentRoots.to_a.first) if @issues_query.componentRoots and @issues_query.componentRoots.size == 1 %> - <%= component_select_tag 'componentRoots', :resource_type_property => 'supportsGlobalDashboards', :width => '100%', - :selected_resource => selected_componentRoot, - :display_key => true, - :placeholder => message('issue_filter.criteria.project'), - :html_id => 'select-project', - :allow_clear => true + <%= component_select_tag 'componentRoots', + :width => '100%', + :resource_type_property => 'supportsGlobalDashboards', + :qualifiers => ['TRK'], + :selected_resource => selected_componentRoot, + :display_key => true, + :placeholder => message('issue_filter.criteria.project'), + :html_id => 'select-project', + :allow_clear => true -%> </li> <li id="criteria-severity" class="marginbottom5"> |