From fe4e038a7be2a9fc040be44f51e5230a2fc414f7 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 21 Jan 2014 13:49:10 +0100
Subject: [PATCH] Drop unused ruby code (issues/search2)

---
 .../app/controllers/issues_controller.rb      |  22 ----
 .../views/issues/_filter_favourites.html.erb  |  14 +-
 .../views/issues/_filter_favourites2.html.erb |   9 --
 .../app/views/issues/_sidebar.html.erb        |  85 ------------
 .../WEB-INF/app/views/issues/search.html.erb  |   2 +-
 .../WEB-INF/app/views/issues/search2.html.erb | 123 ------------------
 6 files changed, 6 insertions(+), 249 deletions(-)
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites2.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb
 delete mode 100644 sonar-server/src/main/webapp/WEB-INF/app/views/issues/search2.html.erb

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
index 57485a69e83..06a56f0e8de 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
@@ -38,28 +38,6 @@ class IssuesController < ApplicationController
 
   end
 
-  def search2
-    @issues_query_params = criteria_params
-    @first_search = issues_query_params_sanitized.empty?
-    @unchanged = issues_query_params_sanitized.empty?
-
-    init_params
-    if params[:id]
-      @filter = find_filter(params[:id].to_i)
-      @first_search = false
-      issue_filter_result = Internal.issues.execute(params[:id].to_i, @issues_query_params)
-    else
-      issue_filter_result = Internal.issues.execute(@issues_query_params)
-    end
-    @issues_query = issue_filter_result.query
-    @issues_result = issue_filter_result.result
-
-    if request.xhr?
-      @ajax_mode = true
-      render :partial => 'search_ajax'
-    end
-  end
-
   # Load existing filter
   # GET /issues/filter/<filter id>
   def filter
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb
index 397aecff874..4c1f60180b8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites.html.erb
@@ -1,13 +1,9 @@
-<div id="sidebar-favourites">
 <% if logged_in? %>
-  <li class="sidebar-title"><%= message('issue_filter.favourite_filters') -%></li>
+  {
   <% @favourite_filters.each do |filter| %>
-    <li <%= "class='active'" if @filter && filter.id==@filter.id -%>>
-      <a href="<%= ApplicationController.root_context -%>/issues/filter/<%= filter.id -%>"><%= h filter.name -%></a>
-    </li>
+    "<%= h filter.id -%>": "<%= escape_javascript filter.name -%>",
   <% end %>
-
-  <li><a href="<%= ApplicationController.root_context -%>/issues/manage" class="link-action"><%= message('manage') %></a></li>
-  <li class="spacer"></li>
+  }
+<% else %>
+  null
 <% end %>
-</div>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites2.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites2.html.erb
deleted file mode 100644
index ce3f07694ec..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_filter_favourites2.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/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
deleted file mode 100644
index 2f05024795c..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_sidebar.html.erb
+++ /dev/null
@@ -1,85 +0,0 @@
-<ul class="sidebar gray-sidebar">
-  <%= render :partial => 'issues/filter_favourites' -%>
-
-  <form method="GET" action="<%= ApplicationController.root_context -%>/issues/search" >
-
-    <% if @filter && @filter.id %>
-      <input type="hidden" name="id" value="<%= h @filter.id.to_s -%>">
-    <% end %>
-    <input type="hidden" name="sort" value="<%= h @issues_query.sort -%>"/>
-    <input type="hidden" name="asc" value="<%= h @issues_query.asc -%>"/>
-
-    <li class="sidebar-title">
-      <%= message('issue_filter.new_search') -%>
-    </li>
-    <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',
-                               :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">
-      <%= message 'issue_filter.criteria.severity' -%>:
-      <%= dropdown_tag 'severities[]', options_for_select(RulesConfigurationController::RULE_PRIORITIES, @issues_query.severities),
-                       {:width => '100%', :placeholder => message('issue_filter.criteria.severity')},
-                       {:id => 'select-severities', :multiple => true}-%>
-    </li>
-    <li id="criteria-status" class="marginbottom5">
-      <%= message 'issue_filter.criteria.status' -%>:
-      <%= dropdown_tag 'statuses[]', options_for_select(@options_for_statuses, @issues_query.statuses),
-                       {:width => '100%', :placeholder => message('issue_filter.criteria.status')},
-                       {:id => 'select-status', :multiple => true}-%>
-    </li>
-    <li id="criteria-resolution" class="marginbottom5">
-      <%= message 'issue_filter.criteria.resolution' -%>:
-      <%= dropdown_tag 'resolutions[]', options_for_select(@options_for_resolutions, @issues_query.resolutions),
-                       {:width => '100%', :placeholder => message('issue_filter.criteria.resolution')},
-                       {:id => 'select-resolution', :multiple => true}-%>
-    </li>
-    <li id="criteria-assignee" class="marginbottom5">
-      <%= message 'issue_filter.criteria.assignee' -%>:
-      <%
-         if @issues_query.assignees && @issues_query.assignees.size == 1
-           selected_assignee = Api.users.findByLogin(@issues_query.assignees.to_a.first)
-           selected_id = nil
-           selected_text = nil
-         elsif !@issues_query.assigned.nil? && !@issues_query.assigned
-           selected_assignee = nil
-           selected_id = "'<unassigned>'"
-           selected_text = escape_javascript(message('unassigned'))
-         end
-      %>
-      <%= user_select_tag('assignees', :selected_user => selected_assignee, :selected_id => selected_id, :selected_text => selected_text,
-                        :width => '100%', :placeholder => message('issue_filter.criteria.assignee'),
-                        :html_id => 'select-assignee', :open => false, :allow_clear => true,
-                        :include_choices => {'<unassigned>' => escape_javascript(message('unassigned'))}) -%>
-    </li>
-    <li id="criteria-reporter" class="marginbottom5">
-      <%= message 'issue_filter.criteria.reporter' -%>:
-      <% selected_reporter = Api.users.findByLogin(@issues_query.reporters.to_a.first) if @issues_query.reporters && @issues_query.reporters.size == 1 %>
-      <%= user_select_tag('reporters', {:selected_user => selected_reporter, :width => '100%', :placeholder => message('issue_filter.criteria.reporter'),
-                                        :html_id => 'select-reporter', :open => false, :allow_clear => true}) -%>
-    </li>
-    <li id="criteria-created" class="marginbottom5">
-      <%= message('issue_filter.criteria.created_after') -%>:<br>
-      <input type="text" id="select-created-after" name="createdAfter" value="<%= Api::Utils.format_date(@issues_query.createdAfter) -%>" size="10" maxlength="10" class="marginbottom5">
-      <br>
-      <%= message 'issue_filter.criteria.created_before' -%>:<br>
-      <input type="text" id="select-created-before" name="createdBefore" value="<%= Api::Utils.format_date(@issues_query.createdBefore) -%>" size="10" maxlength="10"><br>
-      <span class="small gray"><%= message 'issue_filter.criteria.date_format' -%></span>
-    </li>
-    <li>
-      <input type="submit" name="search" value="<%= message('search_verb') -%>" id="search-button" />
-      <a href="<%= ApplicationController.root_context -%>/issues" class="link-action"><%= message 'issue_filter.new_search' -%></a>
-    </li>
-  </form>
-</ul>
-
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index 6685abc6b04..f42e37c1a53 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -30,7 +30,7 @@
     severities: <%= RulesConfigurationController::RULE_PRIORITIES.to_json.html_safe -%>,
     statuses: <%= @options_for_statuses.to_json.html_safe -%>,
     resolutions: <%= @options_for_resolutions.to_json.html_safe -%>,
-    favorites: <%= render :partial => 'issues/filter_favourites2' -%>,
+    favorites: <%= render :partial => 'issues/filter_favourites' -%>,
 
     phrases: {
       'any':           '<%= escape_javascript message('any') -%>',
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search2.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search2.html.erb
deleted file mode 100644
index 875baa43d86..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search2.html.erb
+++ /dev/null
@@ -1,123 +0,0 @@
-<div class="navigator navigator-simple">
-
-  <div class="navigator-filters"></div>
-
-
-  <div class="navigator-results">
-    <%= render :partial => 'search' -%>
-  </div>
-</div>
-
-<script type="text/javascript">
-  function onBulkIssues(issues_query_params){
-    // SONAR-4723 pagination parameters should be removed after applying bulk change
-    delete issues_query_params.pageIndex;
-    window.location = baseUrl + '/issues/search?' + jQuery.param(issues_query_params);
-  }
-
-  function onSaveAs(data) {
-    window.location = baseUrl + '/issues/filter/' + data;
-  }
-
-  function onCopy(data) {
-    window.location = baseUrl + '/issues/filter/' + data;
-  }
-
-  function onEdit(data) {
-    window.location = baseUrl + '/issues/filter/' + data;
-  }
-</script>
-
-<script id="filterBarTemplate" type="text/template">
-  <form method="get" action="<%= ApplicationController.root_context -%>/issues/search">
-    <% if @filter && @filter.id %>
-      <input type="hidden" name="id" value="<%= h @filter.id.to_s -%>">
-    <% end %>
-    <input type="hidden" name="sort" value="<%= h @issues_query.sort -%>"/>
-    <input type="hidden" name="asc" value="<%= h @issues_query.asc -%>"/>
-
-    <div class="navigator-filters-list"></div>
-    <button class="navigator-filter-submit"><%= message('search_verb') -%></button>
-    <a class="navigator-filter-new-search link-action" href="<%= ApplicationController.root_context -%>/issues/search"><%= message 'issue_filter.new_search' -%></a>
-  </form>
-</script>
-
-<%= render :partial => '/navigator/filter_templates' -%>
-
-<%
-   component_labels = Project.by_keys(@issues_query.componentRoots).map{|c| c ? c.name : nil}
-   assignee_keys = @issues_query.assignees
-   assignee_labels = user_labels(@issues_query.assignees)
-   if @issues_query.assigned==false
-     assignee_keys = ['<unassigned>'] + assignee_keys
-     assignee_labels = [message('unassigned')] + assignee_labels
-   end
-   reporter_labels = user_labels(@issues_query.reporters)
-%>
-
-<script>
-  _.templateSettings = {
-    interpolate: /\{\{(.+?)\}\}/g,
-    evaluate: /\{\[(.+?)\]\}/g,
-    escape: /\{\{\{(.+?)\}\}\}/g
-  };
-
-  _.extend(window.SS, {
-    severities: <%= RulesConfigurationController::RULE_PRIORITIES.to_json.html_safe -%>,
-    statuses: <%= @options_for_statuses.to_json.html_safe -%>,
-    resolutions: <%= @options_for_resolutions.to_json.html_safe -%>,
-    favorites: <%= render :partial => 'issues/filter_favourites2' -%>,
-
-    phrases: {
-      'any':           '<%= escape_javascript message('any') -%>',
-      'anytime':       '<%= escape_javascript message('anytime') -%>',
-      'all':           '<%= escape_javascript message('all') -%>',
-      'manage':        '<%= escape_javascript message('manage') -%>',
-      'to':            '<%= escape_javascript message('to') -%>',
-      'project':       '<%= escape_javascript message('issue_filter.criteria.project') -%>',
-      'severity':      '<%= escape_javascript message('issue_filter.criteria.severity') -%>',
-      'severities': {
-        blocker:       '<%= escape_javascript message('severity.BLOCKER') -%>',
-        critical:      '<%= escape_javascript message('severity.CRITICAL') -%>',
-        major:         '<%= escape_javascript message('severity.MAJOR') -%>',
-        minor:         '<%= escape_javascript message('severity.MINOR') -%>',
-        info:          '<%= escape_javascript message('severity.INFO') -%>'
-      },
-      'status':        '<%= escape_javascript message('issue_filter.criteria.status') -%>',
-      'statuses': {
-        open:          '<%= escape_javascript message('issue.status.OPEN') -%>',
-        confirmed:     '<%= escape_javascript message('issue.status.CONFIRMED') -%>',
-        reopened:      '<%= escape_javascript message('issue.status.REOPENED') -%>',
-        resolved:      '<%= escape_javascript message('issue.status.RESOLVED') -%>',
-        closed:        '<%= escape_javascript message('issue.status.CLOSED') -%>'
-      },
-      assignee:        '<%= escape_javascript message('issue_filter.criteria.assignee') -%>',
-      resolution:      '<%= escape_javascript message('issue_filter.criteria.resolution') -%>',
-      resolutions: {
-        falsePositive: '<%= escape_javascript message('issue.resolution.FALSE-POSITIVE') -%>',
-        fixed:         '<%= escape_javascript message('issue.resolution.FIXED') -%>',
-        removed:       '<%= escape_javascript message('issue.resolution.REMOVED') -%>'
-      },
-      reporter:        '<%= escape_javascript message('issue_filter.criteria.reporter') -%>',
-      created:         '<%= escape_javascript message('issue_filter.criteria.created') -%>',
-
-      moreCriteria:    '<%= escape_javascript message('issue_filter.more_criteria') -%>',
-      unassigned:      '<%= escape_javascript message('unassigned') -%>',
-      filtersList:     '<%= escape_javascript message('issue_filter.filter_list') -%>'
-    }
-  });
-
-  var queryParams = [
-    { key: 'componentRoots', value: <%= @issues_query.componentRoots.to_json -%>, text: <%= component_labels.to_json -%> },
-    { key: 'severities[]', value: <%= @issues_query.severities.to_json -%> },
-    { key: 'statuses[]', value: <%= @issues_query.statuses.to_json -%> },
-    { key: 'resolutions[]', value: <%= @issues_query.resolutions.to_json -%> },
-    { key: 'assignees', value: <%= assignee_keys.to_json -%>, text: <%= assignee_labels.to_json -%> },
-    { key: 'reporters', value: <%= @issues_query.reporters.to_json -%>, text: <%= reporter_labels.to_json -%> },
-    { key: 'createdAfter', value: '<%= Api::Utils.format_date(@issues_query.createdAfter) -%>' },
-    { key: 'createdBefore', value: '<%= Api::Utils.format_date(@issues_query.createdBefore) -%>' }
-  ];
-
-  window.SS.IssuesNavigatorAppOld.start();
-  window.SS.IssuesNavigatorAppOld.filterBarView.restoreFromQuery(queryParams);
-</script>
-- 
2.39.5