diff options
Diffstat (limited to 'app/views/general')
| -rw-r--r-- | app/views/general/frontpage.rhtml | 6 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index ddbe20ea1..9584b1608 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -62,10 +62,10 @@ <p>None yet.</p> <% else %> <% for search_result in @search_results %> - <% if search_result.class.to_s == 'InfoRequestEvent' %> - <%= render :partial => 'request/request_listing_via_event', :locals => { :event => search_result, :info_request => search_result.info_request } %> + <% if search_result[:model].class.to_s == 'InfoRequestEvent' %> + <%= render :partial => 'request/request_listing_via_event', :locals => { :event => search_result[:model], :info_request => search_result[:model].info_request } %> <% else %> - <p><strong>Unexpected search result type <%=search_result.class.to_s%></strong></p> + <p><strong>Unexpected search result type <%=search_result[:model].class.to_s%></strong></p> <% end %> <% end %> <% end %> diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index d94272922..a919bff45 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -26,17 +26,21 @@ <h1><%=@title%></h1> + <% if @search_spelling %> + <p id="did_you_mean">Did you mean: <%= link_to @search_spelling, search_url(:query => @search_spelling) %></p> + <% end %> + <% if @search_results.empty? %> <% else %> <% for search_result in @search_results %> - <% if search_result.class.to_s == 'PublicBody' %> - <%= render :partial => 'body/body_listing_single', :locals => { :public_body => search_result } %> - <% elsif search_result.class.to_s == 'User' %> - <%= render :partial => 'user/user_listing_single', :locals => { :display_user => search_result } %> - <% elsif search_result.class.to_s == 'InfoRequestEvent' %> - <%= render :partial => 'request/request_listing_via_event', :locals => { :event => search_result, :info_request => search_result.info_request } %> + <% if search_result[:model].class.to_s == 'PublicBody' %> + <%= render :partial => 'body/body_listing_single', :locals => { :public_body => search_result[:model] } %> + <% elsif search_result[:model].class.to_s == 'User' %> + <%= render :partial => 'user/user_listing_single', :locals => { :display_user => search_result[:model] } %> + <% elsif search_result[:model].class.to_s == 'InfoRequestEvent' %> + <%= render :partial => 'request/request_listing_via_event', :locals => { :event => search_result[:model], :info_request => search_result[:model].info_request } %> <% else %> - <p><strong>Unknown search result type <%=search_result.class.to_s%></strong></p> + <p><strong>Unknown search result type <%=search_result[:model].class.to_s%></strong></p> <% end %> <% end %> <% end %> |