From 6698ff8169a7e000d435b6b39802c77f35ae6833 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 19 Jan 2009 10:28:58 -0800
Subject: [PATCH] Moved the Rate History out of the users partial and into a
 partial for Rates

* This will allow the RatesController to use the same view

  #1916
---
 app/controllers/rates_controller.rb |  2 ++
 app/views/rates/_list.html.erb      | 31 ++++++++++++++++++++++++++++
 app/views/rates/index.html.erb      | 27 ++----------------------
 app/views/users/_rates.html.erb     | 32 +----------------------------
 4 files changed, 36 insertions(+), 56 deletions(-)
 create mode 100644 app/views/rates/_list.html.erb

diff --git a/app/controllers/rates_controller.rb b/app/controllers/rates_controller.rb
index 8fc06f6..a781cfc 100644
--- a/app/controllers/rates_controller.rb
+++ b/app/controllers/rates_controller.rb
@@ -1,4 +1,6 @@
 class RatesController < ApplicationController
+  helper :users
+  
   # GET /rates
   # GET /rates.xml
   def index
diff --git a/app/views/rates/_list.html.erb b/app/views/rates/_list.html.erb
new file mode 100644
index 0000000..6a997fd
--- /dev/null
+++ b/app/views/rates/_list.html.erb
@@ -0,0 +1,31 @@
+<table class="list">
+	<thead>
+	  <th style="width:15%"><%= l(:label_date) %></th>
+	  <th><%= l(:label_project) %></th>
+	  <th style="width:15%"><%= l(:rate_label_rate) %></th>
+	  <th style="width:5%"></th>
+	</thead>
+	<tbody>
+	<% @rates.each do |rate| %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+      <td><%= h format_date(rate.date_in_effect) %></td>
+      <td>
+        <%= link_to(h(rate.project), :controller => 'projects', :action => 'show', :id => rate.project) %>
+      </td>
+      <td align="right"><%= h rate.amount %></td>
+      <td align="center">
+        <% if rate.unlocked? %>
+        <%= link_to image_tag('edit.png'),
+          {:action => 'not_implemented', :id => @user, :rate_id => rate },
+          {:method => :post } %>
+        <%= link_to image_tag('delete.png'),
+          {:action => 'not_implemented', :id => @user, :rate_id => rate },
+          {:method => :post, :confirm => l(:text_are_you_sure) } %>
+        <% else %>
+        <%= image_tag('locked.png') %>
+        <% end %>
+      </td>
+	</tr>
+	</tbody>
+<% end; reset_cycle %>
+</table>
diff --git a/app/views/rates/index.html.erb b/app/views/rates/index.html.erb
index 2de155f..8c664e4 100644
--- a/app/views/rates/index.html.erb
+++ b/app/views/rates/index.html.erb
@@ -1,26 +1,3 @@
-<h1>Listing rates</h1>
+<h1><%= l(:rate_label_rate_history) %></h1>
 
-<table>
-  <tr>
-    <th>Amount</th>
-    <th>User</th>
-    <th>Project</th>
-    <th>Date in effect</th>
-  </tr>
-
-<% for rate in @rates %>
-  <tr>
-    <td><%=h rate.amount %></td>
-    <td><%=h rate.user_id %></td>
-    <td><%=h rate.project_id %></td>
-    <td><%=h rate.date_in_effect %></td>
-    <td><%= link_to 'Show', rate %></td>
-    <td><%= link_to 'Edit', edit_rate_path(rate) %></td>
-    <td><%= link_to 'Destroy', rate, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New rate', new_rate_path %>
+<%= render :partial => 'list' %>
\ No newline at end of file
diff --git a/app/views/users/_rates.html.erb b/app/views/users/_rates.html.erb
index ffc10eb..5af545e 100644
--- a/app/views/users/_rates.html.erb
+++ b/app/views/users/_rates.html.erb
@@ -7,34 +7,4 @@
 <%# Can't expect everyone to upgrade at the moment %>
 <% @rates = Rate.history_for_user(@user) %>
 
-<table class="list">
-	<thead>
-	  <th style="width:15%"><%= l(:label_date) %></th>
-	  <th><%= l(:label_project) %></th>
-	  <th style="width:15%"><%= l(:rate_label_rate) %></th>
-	  <th style="width:5%"></th>
-	</thead>
-	<tbody>
-	<% @rates.each do |rate| %>
-	<tr class="<%= cycle 'odd', 'even' %>">
-      <td><%= h format_date(rate.date_in_effect) %></td>
-      <td>
-        <%= link_to(h(rate.project), :controller => 'projects', :action => 'show', :id => rate.project) %>
-      </td>
-      <td align="right"><%= h rate.amount %></td>
-      <td align="center">
-        <% if rate.unlocked? %>
-        <%= link_to image_tag('edit.png'),
-          {:action => 'not_implemented', :id => @user, :rate_id => rate },
-          {:method => :post } %>
-        <%= link_to image_tag('delete.png'),
-          {:action => 'not_implemented', :id => @user, :rate_id => rate },
-          {:method => :post, :confirm => l(:text_are_you_sure) } %>
-        <% else %>
-        <%= image_tag('locked.png') %>
-        <% end %>
-      </td>
-	</tr>
-	</tbody>
-<% end; reset_cycle %>
-</table>
+<%= render :partial => 'rates/list' %>