Moving to_json parameters over to the model so that they're used whenever a User is json'd

Author: Tom Copeland

Diff for: app/controllers/users_controller.rb

@@ -2,7 +2,7 @@ class UsersController < ApplicationController
 
   def show
     respond_to do |wants| 
-      wants.js {render :json => user.to_json(:except => [:unix_pw, :email, :user_pw, :confirm_hash]) }
+      wants.js {render :json => user }
     end
   end
 

Diff for: app/models/user.rb

@@ -117,6 +117,10 @@ def password
   def home_directory
     "/home/#{user_name}"
   end
+  
+  def to_json(args = {})
+    ActiveSupport::JSON.encode(as_json({:except => [:unix_pw, :email, :user_pw, :confirm_hash]}.merge(args)))
+  end
 
 end