From 96b71fb42464204f081bdbcd90c522c990f17b0a Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Tue, 1 Apr 2008 20:47:57 +0000
Subject: [PATCH] ActionItem155: using proper names that are more meaningful that "hit"

---
 app/views/search/_article.rhtml         |  8 ++++----
 app/views/search/_comment.rhtml         |  4 ++--
 app/views/search/_display_results.rhtml |  6 ++++--
 app/views/search/_product.rhtml         | 12 ++++++------
 app/views/search/_profile.rhtml         |  4 ++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/views/search/_article.rhtml b/app/views/search/_article.rhtml
index c6c9799..66bb950 100644
--- a/app/views/search/_article.rhtml
+++ b/app/views/search/_article.rhtml
@@ -1,11 +1,11 @@
 <li>
-  <strong><%= link_to(hit.title, hit.url) %></strong>
+  <strong><%= link_to(article.title, article.url) %></strong>
   <div class="item_meta">
-    <% if hit.last_changed_by %>
+    <% if article.last_changed_by %>
       <span class="cat_item_by">
-      <%= _('by %s') % link_to(hit.last_changed_by.name, hit.last_changed_by.url) %>
+      <%= _('by %s') % link_to(article.last_changed_by.name, article.last_changed_by.url) %>
       </span>
     <% end %>
-    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(hit.updated_on) %></span>
+    <span class="cat_item_update"><%= _('Last update: %s.') % show_date(article.updated_on) %></span>
   </div>
 </li>
diff --git a/app/views/search/_comment.rhtml b/app/views/search/_comment.rhtml
index ebc500c..a9e5be7 100644
--- a/app/views/search/_comment.rhtml
+++ b/app/views/search/_comment.rhtml
@@ -1,7 +1,7 @@
 <li>
-  <strong><%= link_to(hit.title, hit.url)%></strong>
+  <strong><%= link_to(comment.title, comment.url)%></strong>
   <div class="item_meta">
-    <span class="cat_item_by"><%= _('by %s, on "%s"') % [hit.author_name, link_to(hit.article.name, hit.article.url)] %></span>
+    <span class="cat_item_by"><%= _('by %s, on "%s"') % [comment.author_name, link_to(comment.article.name, comment.article.url)] %></span>
   </div>
 </li>
 
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index 1019aab..2d7cec3 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -1,10 +1,12 @@
 <% @results.each do |name,results| %>
   <% if !results.nil? and !results.empty? %>
     <div id="search-results-<%= name %>">
-      <h3><%= @names[name] %></h3>
+      <% if params[:action] != 'assets' %>
+        <h3><%= @names[name] %></h3>
+      <% end %>
       <ul>
       <% results.each do |hit| %>
-        <%= render :partial => partial_for_class(hit.class), :locals => { :hit => hit } %>
+        <%= render :partial => partial_for_class(hit.class), :object => hit %>
       <% end %>
       </ul>
     </div>
diff --git a/app/views/search/_product.rhtml b/app/views/search/_product.rhtml
index aa1a226..662a1e8 100644
--- a/app/views/search/_product.rhtml
+++ b/app/views/search/_product.rhtml
@@ -2,16 +2,16 @@
 
 <li>
   <div class='search-result-text'>
-    <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
+    <%= image_tag(product.image.public_filename(:minor)) if product.image %>
     <strong>
-      <%= link_to_product(hit) %>
+      <%= link_to_product(product) %>
     </strong> 
     <ul>
-      <li> <%= _('Price: %d') % hit.price %> </li>
-      <% if hit.enterprise %>
-        <li> <%= _('Suplier: %s') % link_to_homepage(hit.enterprise.name, hit.enterprise.identifier) %> </li>
+      <li> <%= _('Price: %d') % product.price %> </li>
+      <% if product.enterprise %>
+        <li> <%= _('Suplier: %s') % link_to_homepage(product.enterprise.name, product.enterprise.identifier) %> </li>
       <% end %>
-      <li> <%= _('Category: %s') % link_to_category(hit.product_category) %> </li>
+      <li> <%= _('Category: %s') % link_to_category(product.product_category) %> </li>
     </ul>
   </div>
 </li>
diff --git a/app/views/search/_profile.rhtml b/app/views/search/_profile.rhtml
index fca8153..7cfb582 100644
--- a/app/views/search/_profile.rhtml
+++ b/app/views/search/_profile.rhtml
@@ -1,9 +1,9 @@
 <%# FIXME add more information %>
 <li>
   <div class='search-result-text'>
-    <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
+    <%= image_tag(profile.image.public_filename(:minor)) if profile.image %>
     <strong>
-      <%= link_to_homepage(hit.name, hit.identifier) %>
+      <%= link_to_homepage(profile.name, profile.identifier) %>
     </strong>
   </div>
 </li>
--
libgit2 0.21.2