Bugfix : Correctly displays bookings in the Home page of the user

Author: romaricpascal

app/controllers/booking_controller.rb

@@ -98,6 +98,6 @@ def find_by_user
 
     @bookings = Booking.where('user_id=?',params[:id])
 
-    render :json => @bookings;
+    render :json => @bookings.to_json(:include => [:user,:hotel])
   end
 end

app/controllers/bookings_controller.rb

@@ -1,18 +1,5 @@
 class Booking < ActiveRecord::Base
 
-
-  attr_accessor :checkinDate
-  attr_accessor :checkoutDate
-  attr_accessor :creditCardNumber
-  attr_accessor :crediaCardType
-  attr_accessor :creditCardName
-  attr_accessor :creditCardExpiryMonth
-  attr_accessor :creditCardExpiryYear
-  attr_accessor :smoking
-  attr_accessor :beds
-  attr_accessor :user
-  attr_accessor :hotel
-
   belongs_to :user, :class_name => 'User', :foreign_key => 'user_id'
   belongs_to :hotel, :class_name => 'Hotel', :foreign_key => 'hotel_id'
 

app/models/booking.rb

@@ -1,4 +1,10 @@
 class User < ActiveRecord::Base
 
   has_many :bookings, :dependent => :destroy
+
+  def to_json(options = {}) 
+
+    options[:except] ||= [:password]
+    super(options)
+  end
 end