Move counting to model where it belongs. Rails-ier response for counts

app/controllers/clients_controller.rb

@@ -1,5 +1,6 @@
 class ClientsController < ApplicationController
   respond_to :html, :xml, :json
+
   # GET /clients
   # GET /clients.xml
   # GET /clients.json
@@ -8,12 +9,13 @@ def index
     respond_with(@clients)
   end
 
-  def draft_timesheets_count
-    @clients = Client.all
-    @timesheets = @clients.map do |client|
-      { :id => client.id, :draft_timesheets_count => client.draft_timesheets.count }
+  # GET /clients/counts
+  # GET /clients/counts.xml
+  # GET /clients/counts.json
+  def counts
+    respond_with(Client.all_with_counts, :root => 'clients') do |format|
+      format.html { redirect_to clients_path }
     end
-    respond_with(@timesheets)
   end
 
   def recent

app/models/client.rb

@@ -13,8 +13,10 @@ class Client < ActiveRecord::Base
 
   validates_presence_of :name
 
-  def draft_timesheets
-    timesheets.draft.to_a # TODO: remove .to_a when Rails to_json bug fixed
+  def self.all_with_counts
+    all.map do |client| 
+      { :id => client.id, :draft_timesheets_count => client.timesheets.draft.count }
+    end
   end
 
 end

app/views/clients/index.html.erb

@@ -27,4 +27,4 @@
 <%= link_to 'New client', new_client_path -%>
 
 <br/>
-<%= link_to 'Update draft timesheets count', draft_timesheets_count_clients_path, :remote => true, :'data-type' => :json, :id => 'update_client_details' -%>
+<%= link_to 'Update draft timesheets count', counts_clients_path, :remote => true, 'data-type' => :json, :id => 'update_draft_timesheets' -%>

config/routes.rb

@@ -6,7 +6,7 @@
     collection do
       get :recent
       get :newest
-      get :draft_timesheets_count
+      get :counts
     end
 
     resources :billing_codes