SONAR-3825 delete columns

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 b2eaf2a988955446a2bf3931f6e6e96085499d11..395b0f1690ff82c2379f1d2ba0f02511d1b022e8 100644 (file)
--- 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 55ae3aa3db76c0f446a8b1bddb2bd5e5e0916f48..ed5c8f714becd964257cd902014a0e4d4b5f5231 100644 (file)
--- 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 5b32a375261594999cb65b6e88a80456d03d1579..692b37f3a11f00faf09246ca9a3e73e6d4074eb7 100644 (file)
--- 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 ceedd209aa80e50473f47a3e6e6d2b08fd5efe31..4a6dc80c25729d0cd5b440c44155c3732ffcbaf6 100644 (file)
--- 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 {