From 61b9d224ddb817e9d821644d75b83c10eb6194d0 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Wed, 28 Nov 2012 14:11:00 +0100
Subject: [PATCH] SONAR-3825 delete columns

---
 .../app/controllers/measures_controller.rb      |  2 --
 .../app/models/measure_filter_display.rb        |  4 +++-
 .../app/views/measures/_display_list.html.erb   | 17 ++++++++++++++---
 .../WEB-INF/app/views/measures/search.html.erb  |  1 -
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
index b2eaf2a9889..395b0f1690f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/measures_controller.rb
@@ -31,9 +31,7 @@ class MeasuresController < ApplicationController
     else
       @filter = MeasureFilter.new
     end
-    puts "params:---------- #{params}"
     @filter.criteria=(params)
-    puts "criteria: ------------#{@filter.criteria}"
     @filter.enable_default_display
     @filter.execute(self, :user => current_user)
   end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb
index 55ae3aa3db7..ed5c8f714be 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display.rb
@@ -42,7 +42,9 @@ class MeasureFilterDisplay
     @options = options
   end
 
+  # sorted array of parameters :
+  # [[key1,value1], [key2,value2]]
   def url_params
-    {}
+    []
   end
 end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
index 5b32a375261..692b37f3a11 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
@@ -39,9 +39,20 @@
         });
       }
       function deleteCol(id) {
-
+        var cell = $j('#measures-table tr.admin td[index=' + id + ']');
+        var columnIndex = cell.parent().children().index(cell);
+        cols.splice(columnIndex, 1);
+        $j('#measures-table thead tr').each(function () {
+          var tr = $j(this);
+          var td1 = tr.find('th:eq(' + columnIndex + ')');
+          td1.detach();
+        });
+        $j('#measures-table tbody tr').each(function () {
+          var tr = $j(this);
+          var td1 = tr.find('td:eq(' + columnIndex + ')');
+          td1.detach();
+        });
       }
-
     </script>
   <%
      end
@@ -103,7 +114,7 @@
       <% @filter.display.columns.each_with_index do |column, index| %>
         <td class="<%= column.align -%>" index="<%= index -%>">
           <a href="javascript:leftCol(<%= index -%>)" title="<%= message('move_left') -%>"><%= image_tag("controls/resultset_previous.png") -%></a>
-          <a href="#" onclick="deleteCol(<%= index -%>)" title="<%= message('delete_column') -%>"><%= image_tag("bin_closed.png") -%></a>
+          <a href="javascript:deleteCol(<%= index -%>)" title="<%= message('delete_column') -%>"><%= image_tag("bin_closed.png") -%></a>
           <a href="javascript:rightCol(<%= index -%>)" title="<%= message('move_right') -%>"><%= image_tag("controls/resultset_next.png") -%></a>
         </td>
       <% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index ceedd209aa8..4a6dc80c257 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -2,7 +2,6 @@
   <style type="text/css">
     #filter-form [type="text"].large-input {
       width: 180px;
-
     }
 
     #filter-form select.large-input {
-- 
2.39.5