Moving to_json parameters over to the model so that they're used when…

…ever a User is json'd
rubycentral · Oct 17, 2009 · de6439b · de6439b
1 parent 5e5e521
commit de6439b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/controllers/users_controller.rb b/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 --git a/app/models/user.rb b/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