[myexperiment-hackers] [3422] branches/contextualisation/app: Fixes to URLs in filters

[noreply]

Revision

3422

Author

fbacall

Date

2013-02-15 13:03:27 +0000 (Fri, 15 Feb 2013)

Log Message

Fixes to URLs in filters

Modified Paths

• branches/contextualisation/app/helpers/application_helper.rb
• branches/contextualisation/app/views/content/_index.rhtml

Diff

Modified: branches/contextualisation/app/helpers/application_helper.rb (3421 => 3422)

--- branches/contextualisation/app/helpers/application_helper.rb	2013-02-15 09:35:39 UTC (rev 3421)
+++ branches/contextualisation/app/helpers/application_helper.rb	2013-02-15 13:03:27 UTC (rev 3422)
@@ -1593,9 +1593,17 @@
       prefix = context.name
     else
       prefix = ''
+
+
+        url_for
     end
 
     prefix
   end
 
+  # Creates a URL from a path and a hash of parameters
+  def url_with_params(url, params)
+    url + '?' + params.delete_if {|k,v| v.nil? || v.empty?}.to_query
+  end
+
 end

Modified: branches/contextualisation/app/views/content/_index.rhtml (3421 => 3422)

--- branches/contextualisation/app/views/content/_index.rhtml	2013-02-15 09:35:39 UTC (rev 3421)
+++ branches/contextualisation/app/views/content/_index.rhtml	2013-02-15 13:03:27 UTC (rev 3422)
@@ -1,3 +1,4 @@
+
 <div class="pivot">
   <div class="left">
     <% if @pivot[:filters].length > 0 %>
@@ -3,5 +4,5 @@
       <div class="category">Search filter terms</div>
       <div class="search_filters">
-        <form action="" url_for(request.query_parameters) -%>" method="GET">
+        <form action="" url_with_params(request.path, request.query_parameters) -%>" method="GET">
           <div class="filter_search_box">
             <input class="query" name="filter_query" value="<%= params[:filter_query] -%>" />
@@ -11,7 +12,7 @@
             <% end %>
             <% if @pivot[:cancel_filter_query_url] %>
               <%= link_to('<img src="" />',
-                  @pivot[:cancel_filter_query_url]) -%>
+                          url_with_params(request.path, @pivot[:cancel_filter_query_url])) -%>
             <% else %>
               <input class="submit" type="image" src="" name="submit" />
             <% end %>
@@ -32,8 +33,8 @@
             <div class="options">
               <% filter[:objects].each do |object| %>
                 <div title='<%= h(object[:plain_label]) -%>'<%= object[:selected] ? ' class="selected"' : '' -%>>
-                  <input class='checkbox' type='checkbox'  <% if object[:selected] %> checked='checked' <% end %> />
-                  <a href="" object[:label_uri].delete_if {|k,v| v.nil?}.to_param -%>">
+                  <input class='checkbox' type='checkbox'  <% if object[:selected] %> checked='checked' <% end %> />
+                  <a href="" url_with_params(request.path, object[:label_uri]) -%>">
                     <div class='count'><%= object[:count] -%></div>
                     <div class='label'><span class='truncate'><%= object[:label] -%></span></div>
                   </a>
@@ -72,13 +73,13 @@
         search box below to refine the results.<% end %>
       </div>
       <div>
-        <form action="" url_for(request.query_parameters) -%>" method="GET">
+        <form action="" request.query_parameters.to_param -%>" method="GET">
           <div class="search_box">
             <input class="query" name="query" value="<%= params[:query] -%>" />
             <% if request.query_parameters["filter"] %>
               <input name="filter" type="hidden" value="<%= request.query_parameters["filter"].gsub('"', '&quot;') -%>" />
             <% end %>
-            <input class="submit" type="submit" value="Search"></input>
+            <input class="submit" type="submit" value="Search"/>
           </div>
           <% if @pivot[:query_problem] %>
             <div class="search_query_problem">
@@ -87,7 +88,7 @@
           <% end %>
           <% if params[:query] && controller.class != SearchController %>
             <div class="remove_search_query">
-              <%= link_to("Remove search query", url_for(request.query_parameters.merge({ "query", nil }))) -%>
+              <%= link_to("Remove search query", url_with_params(request.path, request.query_parameters.merge({ "query", nil }))) -%>
             </div>
           <% end %>
         </form>
@@ -97,7 +98,7 @@
           <%= @pivot[:summary] -%></div>
       <% end %>
       <% if @pivot[:reset_filters_url] %>
-        <div class="reset_filters"><%= link_to("Remove all filters", @pivot[:reset_filters_url]) -%></div>
+        <div class="reset_filters"><%= link_to("Remove all filters", url_with_params(request.path, @pivot[:reset_filters_url])) -%></div>
       <% end %>
     </div>
     <% if @pivot[:results].empty? %>
@@ -125,3 +126,4 @@
 <%= _javascript__include_tag "ellipsis.js" %>
 <script>truncate_spans()</script>
 
+