correctly guess graph index

antifuchs · Feb 9, 2012 · f854181 · f854181
1 parent 440cefe
commit f854181
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/views/dashboard.erb b/views/dashboard.erb
@@ -3,9 +3,11 @@
 <div class="row">
     <table>
     <% row = 1 %>
-    <% @dashboard.graphs.in_groups_of(@graph_columns) do |graphs| %>
+    <% grouped_graphs = @dashboard.graphs.in_groups_of(@graph_columns) %>
+    <% grouped_graphs.each do |graphs| %>
         <tr>
-        <% graphs.each_with_index do |graph,i| %>
+        <% graphs.each do |graph| %>
+            <% i = grouped_graphs.rindex(graphs) * @graph_columns + graphs.rindex(graph) %>
             <td>
             <% if graph %>
                 <% if graph[:graphite][:description] %>
@@ -29,19 +31,13 @@
         .popover({
           placement: "above", delayIn: 1000
         })
-        .click(function(e) {
-          e.preventDefault()
-        })
     })
 
     $(function () {
       $("img[rel=popover-below]")
         .popover({
           placement: "below", delayIn: 1000
         })
-        .click(function(e) {
-          e.preventDefault()
-        })
     })
 </script>
 <% end %>