From 9422c6fb84408d764d09b3802911f932cc0fcc61 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 11 Dec 2014 13:44:31 +0100 Subject: [PATCH] Remove unused ruby files (issues2 MVC) --- .../app/controllers/issues2_controller.rb | 75 ----- .../webapp/WEB-INF/app/models/navigation.rb | 1 - .../views/issues2/_bulk_change_form.html.erb | 161 ----------- .../views/issues2/_filter_copy_form.html.erb | 20 -- .../views/issues2/_filter_edit_form.html.erb | 20 -- .../views/issues2/_filter_favourites.html.erb | 9 - .../issues2/_filter_save_as_form.html.erb | 20 -- .../issues2/_filter_shared_form.html.erb | 33 --- .../WEB-INF/app/views/issues2/_list.html.erb | 126 --------- .../app/views/issues2/_operations.html.erb | 53 ---- .../views/issues2/_operations_ajax.html.erb | 12 - .../app/views/issues2/_search.html.erb | 4 - .../app/views/issues2/_search_ajax.html.erb | 10 - .../WEB-INF/app/views/issues2/manage.html.erb | 149 ---------- .../WEB-INF/app/views/issues2/search.html.erb | 257 ------------------ 15 files changed, 950 deletions(-) delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/controllers/issues2_controller.rb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_bulk_change_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_copy_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_edit_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_favourites.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_save_as_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_shared_form.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_list.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations_ajax.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search_ajax.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/manage.html.erb delete mode 100644 server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/search.html.erb diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/issues2_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/issues2_controller.rb deleted file mode 100644 index 9cc713e267c..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/issues2_controller.rb +++ /dev/null @@ -1,75 +0,0 @@ -# -# SonarQube, open source software quality management tool. -# Copyright (C) 2008-2014 SonarSource -# mailto:contact AT sonarsource DOT com -# -# SonarQube is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 3 of the License, or (at your option) any later version. -# -# SonarQube is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -require 'set' - -class Issues2Controller < ApplicationController - - SECTION=Navigation::SECTION_ISSUES2 - - before_filter :init_options - before_filter :load_fav_filters, :only => [:index, :search, :search2, :filter, :manage, :favourites, :toggle_fav] - - PAGE_SIZE = 100 - - # GET /issues/index - def index - redirect_to :action => 'search' - end - - # GET /issues/search - def search - - end - - private - - def init_options - @options_for_statuses = Internal.issues.listStatus().map { |s| [message('issue.status.' + s), s] } - @options_for_resolutions = Internal.issues.listResolutions().map { |s| [message('issue.resolution.' + s), s] } - end - - def load_fav_filters - @favourite_filters = Internal.issues.findFavouriteIssueFiltersForCurrentUser() if logged_in? - end - - def find_filter(id) - Internal.issues.findIssueFilter(id) - end - - def criteria_params - new_params = params.clone - new_params.delete('controller') - new_params.delete('action') - new_params - end - - def init_params - params['pageSize'] = PAGE_SIZE unless request.xhr? - end - - def issues_query_params_sanitized - Internal.issues.sanitizeFilterQuery(params).to_hash - end - - def issues_query_params_from_filter(filter) - Internal.issues.deserializeFilterQuery(filter).to_hash - end - -end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb index 7c709252329..4b690d90178 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/navigation.rb @@ -32,7 +32,6 @@ class Navigation SECTION_RESOURCE_CONFIGURATION = Navigation.new('resource_configuration', true) SECTION_SESSION = Navigation.new('session', true) SECTION_ISSUES = Navigation.new('issues', false) - SECTION_ISSUES2 = Navigation.new('issues2', false) SECTION_MEASURES = Navigation.new('measures', false) SECTION_QUALITY_PROFILES = Navigation.new('quality_profiles', false) SECTION_QUALITY_GATES = Navigation.new('quality_gates', false) diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_bulk_change_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_bulk_change_form.html.erb deleted file mode 100644 index 3802a05e99d..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_bulk_change_form.html.erb +++ /dev/null @@ -1,161 +0,0 @@ -<% - project_uuid = @projectUuids.to_a.first if !@projectUuids.empty? && @projectUuids.to_a.size == 1 - project_key = Internal.component_api.findByUuid(project_uuid).key() if project_uuid - max_page_size_reached = @issues.size >= Internal.issues.maxPageSize() - - transitions_by_issues = {} - unresolved_issues = 0 - unresolved_issues_user_can_admin = 0 - at_least_one_issue_is_planned = false - at_least_one_issue_is_assigned = false - all_issues_are_assigned_to_current_user = true - @issues.each do |issue| - transitions = Internal.issues.listTransitions(issue) - transitions.each do |transition| - issues_for_transition = transitions_by_issues[transition.key] || 0 - issues_for_transition += 1 - transitions_by_issues[transition.key] = issues_for_transition - end - unresolved_issues += 1 unless issue.resolution() - if Java::OrgSonarServerUser::UserSession.get().hasProjectPermissionByUuid('issueadmin', issue.projectUuid) - unresolved_issues_user_can_admin += 1 unless issue.resolution() - end - at_least_one_issue_is_planned ||= issue.actionPlanKey() - at_least_one_issue_is_assigned ||= issue.assignee() - all_issues_are_assigned_to_current_user &&= issue.assignee() == current_user.login - end -%> -
- - -
-
-

<%= message('issue_bulk_change.form.title', {:params => @issues.size.to_s}) -%>

-
-
-
- <% if max_page_size_reached %> -

<%= message('issue_bulk_change.max_issues_reached', :params => @issues.size) -%>

- <% end %> -
-
- - <% if unresolved_issues > 0 %> -
- - - <%= assign_added_choices = {} - # SONAR-4728 Display 'Not assigned' option only if at least one issue is assigned - assign_added_choices[''] = escape_javascript(message('unassigned')) if at_least_one_issue_is_assigned - # SONAR-4728 Display 'Assign to me' option only if not not all issues are asigned to current user - assign_added_choices[current_user.login] = escape_javascript(message('assigned_to_me')) unless all_issues_are_assigned_to_current_user - user_select_tag('assign.assignee', :html_id => 'assignee', :open => false, :selected_user => current_user, - :include_choices => assign_added_choices) - -%> - (<%= message('issue_bulk_change.x_issues', :params => unresolved_issues.to_s) -%>) -
- <% - if project_key - plans = Internal.issues.findOpenActionPlans(project_key) - # Display action plan combo box if there are some action plans defined on the project - unless plans.empty? - first_plan = plans[0] - options = plans.map { |plan| - label = plan.deadLine ? "#{h plan.name} (#{format_date(plan.deadLine)})" : h(plan.name) - [label, plan.key] - } - # SONAR-4728 Display 'Unplan' option only if at least one issue is planned - options.unshift([escape_javascript(message('issue.unplan.submit')), '']) if at_least_one_issue_is_planned - plan_options = options_for_select(options, first_plan.key) - %> -
- - - <%= dropdown_tag('plan.plan', plan_options, {:show_search_box => false}, {:id => 'plan'}) -%> - (<%= message('issue_bulk_change.x_issues', :params => unresolved_issues.to_s) -%>) -
- <% end %> - <% end %> -
- - - <%= severity_dropdown_tag('set_severity.severity', severitiy_select_option_tags, {:show_search_box => false}, - {:id => 'severity'}) -%> - (<%= message('issue_bulk_change.x_issues', :params => unresolved_issues_user_can_admin.to_s) -%>) -
- <% end %> - - <% if transitions_by_issues.size > 0 %> -
- - <% transitions_by_issues.keys.sort.each do |transition| %> -   - (<%= message('issue_bulk_change.x_issues', :params => transitions_by_issues[transition].to_s) %>)
- <% end %> -
- <% end %> - -
- -
-
- -
-
- <%= render :partial => 'markdown/tips' -%> -
-
-
- -
- - -
-
-
- - - <%= message('cancel') -%> -
-
-
- diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_copy_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_copy_form.html.erb deleted file mode 100644 index ad34992b288..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_copy_form.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -
- -
-
-

<%= message('issue_filter.copy_filter') -%>

-
- <%= render :partial => 'filter_shared_form' %> -
- - <%= h message('cancel') -%> -
-
-
- diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_edit_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_edit_form.html.erb deleted file mode 100644 index 650e7e19993..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_edit_form.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -
- -
-
-

<%= message('issue_filter.edit_filter') -%>

-
- <%= render :partial => 'filter_shared_form', :locals => {:display_owner => true} %> -
- - <%= message('cancel') -%> -
-
-
- diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_favourites.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_favourites.html.erb deleted file mode 100644 index 4c1f60180b8..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_favourites.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<% if logged_in? %> - { - <% @favourite_filters.each do |filter| %> - "<%= h filter.id -%>": "<%= escape_javascript filter.name -%>", - <% end %> - } -<% else %> - null -<% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_save_as_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_save_as_form.html.erb deleted file mode 100644 index a771f24bd01..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_save_as_form.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -
- -
-
-

<%= message('issue_filter.save_filter') -%>

-
- <%= render :partial => 'filter_shared_form' %> -
- - <%= message('cancel') -%> -
-
-
- diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_shared_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_shared_form.html.erb deleted file mode 100644 index 24c3891792a..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_filter_shared_form.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -<% if !local_assigns.has_key? :display_owner - display_owner = false - end %> -
-
-
- - -
-
- - -
- <% if display_owner && can_be_reassigned_by(current_user, @filter) %> - <% filter_owner = Api.users.findByLogin(@filter.user) %> -
- - <%= user_select_tag('user', :html_id => 'select-filter-owner', :selected_user => filter_owner) -%> -
- <% else %> - - <% end %> - <% if Internal.issues.canUserShareIssueFilter() %> -
- <% if !@filter || @filter.user.nil? || @filter.user == current_user.login %> - - /> - <% else %> - - <% end %> -
- <% end %> -
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_list.html.erb deleted file mode 100644 index 7e07f5f74b6..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_list.html.erb +++ /dev/null @@ -1,126 +0,0 @@ -<% - if @issues_result.issues && !@issues_result.issues.empty? - colspan = 6 -%> -
- - - - - - - - - - - - - - <% - @issues_result.issues.each do |issue| - %> - - - - - - - - - - <% - end - %> - - <%= if @ajax_mode - paginate_java(@issues_result.paging, :colspan => colspan, :id => 'issue-filter-foot', :include_loading_icon => true, - :url_results => url_for({:controller => 'issues', :action => 'search'}.merge(params))) { |label, page_id| - link_to_function label, "refreshList('#{@issues_query.sort}', #{@issues_query.asc}, #{page_id})" - } - else - paginate_java(@issues_result.paging, :colspan => colspan, :id => 'issue-filter-foot', :include_loading_icon => true) { |label, page_id| - link_to(label, params.merge({:pageIndex => page_id})) - } - end - %> -
- <%= column_html(@issues_query, @issues_result, message('severity_abbreviated'), message('severity'), 'SEVERITY') %> - - <%= column_html(@issues_query, @issues_result, message('status'), message('status'), 'STATUS') %> - - <%= message('description') -%> - - <%= message('component') -%> - - <%= column_html(@issues_query, @issues_result, message('issue_filter.header.assignee'), message('issue_filter.header.assignee'), 'ASSIGNEE') %> - - <%= message('issue_filter.header.action_plan') -%> - - <%= column_html(@issues_query, @issues_result, message('issue_filter.header.update_date'), message('issue_filter.header.update_date'), 'UPDATE_DATE') %> -
- - - <%= message("issue.status.#{issue.status}") -%> - <% if issue.resolution %> - [<%= message("issue.resolution.#{issue.resolution}") -%>] - <% end %> - - 'show', :id => issue.key, :modal => true -%>'> - <%= h truncate(issue.message, :length => 100) -%> - - <% project = @issues_result.project(issue) - component = @issues_result.component(issue) -%> -
<%= h (truncate(project.name, :length => 100)) -%>
- <% if component %> - - <% if component.key != project.key %> - <%= h component.longName() -%> - <% end %> - <% else %> - <%= h issue.componentKey() %> - <% end %> - 		- <%= h @issues_result.user(issue.assignee).name if issue.assignee -%> - - <%= h @issues_result.actionPlan(issue).name if issue.actionPlanKey() -%> - - <%= human_short_date(Api::Utils.java_to_ruby_datetime(issue.updateDate())) -%> -
-
-<% - end -%> - - diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations.html.erb deleted file mode 100644 index 389856f6de1..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations.html.erb +++ /dev/null @@ -1,53 +0,0 @@ -<% if @issues_result && @issues_result.maxResultsReached() %> -

<%= message('issue_filter.max_results_reached', :params => @issues_result.paging.total()) -%>

-<% end %> - -<% unless @issues_result.issues && !@issues_result.issues.empty? %> -

<%= message('issue_filter.no_result') -%>

-<% end %> - -<% if logged_in? && !@first_search %> -
-
    - <% if @filter && @filter.id %> -
  • <%= message('copy') -%>
    • - <% end %> - <% if !@unchanged && @filter && @filter.id && @filter.user == current_user.login %> -
  • - <%= link_to message('save'), params.merge({:action => 'save', :id => @filter.id}), :class => 'link-action', :id => 'save', :method => :post -%> -
    • - <% end %> - <% unless @filter %> -
  • - <%= message('save_as') -%> -
    • - <% end %> - <% if @issues_result.issues && !@issues_result.issues.empty? %> -
  • - <%= message('bulk_change') -%> -
    • - <% end %> -
- - <% if @filter && @filter.id && @filter.name.present? %> -
-

- <%= h @filter.name -%> - - <% if !@filter.shared %> - [<%= message 'issue_filter.private' -%>] - <% elsif @filter.user==current_user.login %> - [<%= message 'issue_filter.shared_with_all_users' -%>] - <% elsif @filter.user %> - [<%= message 'shared_by' -%> <%= Api.users.findByLogin(@filter.user).name -%>] - <% end %> - - <% if @filter.user == current_user.login %> -  <%= image_tag 'pencil-small.png', :alt => message('edit') -%> - <% end %> -

-
- <% end %> -
-<% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations_ajax.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations_ajax.html.erb deleted file mode 100644 index 36e6c6d4573..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_operations_ajax.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% if logged_in? && @issues_result.issues && !@issues_result.issues.empty? %> -
- -
-<% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search.html.erb deleted file mode 100644 index f9d6b02a759..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -
- <%= render :partial => 'operations' -%> - <%= render :partial => 'list' -%> -
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search_ajax.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search_ajax.html.erb deleted file mode 100644 index eb1c6bf3e58..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/_search_ajax.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -
- <% - if @issues_result.issues && !@issues_result.issues.empty? - %> - <%= render :partial => 'operations_ajax' -%> - <%= render :partial => 'list' -%> - <% else %> - <%= render :partial => 'shared/no_issues' -%> - <% end %> -
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/manage.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/manage.html.erb deleted file mode 100644 index 619b9f78068..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/manage.html.erb +++ /dev/null @@ -1,149 +0,0 @@ -<% content_for :script do %> - -<% end %> -
-
-

<%= message 'issue_filter.manage.my_filters' -%>

- - - - - - - - - - - <% if @filters.empty? %> - - - - <% else %> - <% @filters.each do |filter| %> - - - - - - - <% end %> - <% end %> - -
<%= message('issue_filter.form.name') -%><%= message('issue_filter.sharing') -%><%= message('operations') -%>
<%= message('issue_filter.no_filters') -%>
- <%= issue_filter_star(filter, @favourite_filter_ids.include?(filter.id)) -%> - - <%= h filter.name -%> - <% if filter.description %> -
<%= h filter.description -%>
- <% end %> - 		- <% if filter.shared %> - <%= message 'issue_filter.shared_with_all_users' -%> - <% else %> - <%= message 'issue_filter.private' -%> - <% end %> - - <%= message('copy') -%> -   - <%= message('edit') -%> -   - <%= link_to_action message('delete'), "#{ApplicationController.root_context}/issues/delete/#{filter.id}", - :class => 'link-action link-red', - :id => "delete_#{filter.name.parameterize}", - :confirm_button => message('delete'), - :confirm_title => 'issue_filter.delete_confirm_title', - :confirm_msg => 'issue_filter.are_you_sure_want_delete_filter_x', - :confirm_msg_params => [filter.name] -%> -
- -
- -

<%= message 'issue_filter.manage.shared_filters' -%>

- - - - - - - - - - - <% if @shared_filters.empty? %> - - - - <% else %> - <% @shared_filters.each do |filter| %> - - - - - - - <% end %> - <% end %> - -
<%= message('issue_filter.form.name') -%><%= message('shared_by') -%><%= message('operations') -%>
<%= message('issue_filter.no_filters') -%>
- <%= issue_filter_star(filter, @favourite_filter_ids.include?(filter.id)) -%> - - <%= h filter.name -%> - <% if filter.description %> -
<%= h filter.description -%>
- <% end %> - 		- <%= h Api.users.findByLogin(filter.user).name -%> - - <%= message('copy') -%> - <% if has_role?(:admin) %> -   - <%= message('edit') -%> -   - <%= link_to_action message('delete'), "#{ApplicationController.root_context}/issues/delete/#{filter.id}", - :class => 'link-action link-red', - :id => "delete_system_#{filter.name.parameterize}", - :confirm_button => message('delete'), - :confirm_title => 'issue_filter.delete_confirm_title', - :confirm_msg => 'issue_filter.are_you_sure_want_delete_filter_x', - :confirm_msg_params => [filter.name] -%> - <% end %> -
- -
-
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/search.html.erb deleted file mode 100644 index 9cd9535b53e..00000000000 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues2/search.html.erb +++ /dev/null @@ -1,257 +0,0 @@ -<% content_for :script do %> - -<% end %> - -
-
-
- -
-
-
-
-
- -
-
-
-
<%= message('issue_filter.max_results_reached', :params => 10000) -%>
-
-
-
-
- - - -- 2.39.5