Merge branch 'section_10_8' into section_10_9

noelrappin · Dec 8, 2012 · 6d88780 · 6d88780
2 parents df3f72b + cc3c597
commit 6d88780
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/assets/javascripts/backbone/routers/tripRouter.js b/app/assets/javascripts/backbone/routers/tripRouter.js
@@ -48,8 +48,9 @@ TimeTravel.Routers.TripRouter = Backbone.Router.extend({
   //##detail
   tripDetail: function(id) {
     var trip = TimeTravel.getTrip(id);
+    var order = new TimeTravel.Models.Order({trip: this.model});
     trip.fetchData();
-    this.basicPage(new TimeTravel.Views.TripDetailView({model: trip}));
+    this.basicPage(new TimeTravel.Views.TripDetailView({model: trip, order: order}));
   }
   //##detail
 

diff --git a/app/assets/javascripts/backbone/views/tripDetailView.js b/app/assets/javascripts/backbone/views/tripDetailView.js
@@ -3,6 +3,10 @@ TimeTravel.Views.TripDetailView = Backbone.View.extend({
   className: 'trip span-20',
 
   //##render
+  initialize: function(options) {
+    this.order = options.order || new TimeTravel.Models.Order({trip: this.model});
+  },
+
   render: function() {
     this.basicRender();
     this.hotelRender(this.hotelsView());
@@ -28,8 +32,7 @@ TimeTravel.Views.TripDetailView = Backbone.View.extend({
 
   //##orders
   ordersView: function() {
-    return new TimeTravel.Views.OrderView({
+    return new TimeTravel.Views.OrderView({model: this.order});
-        model: new TimeTravel.Models.Order({trip: this.model})});
   },
 
   ordersRender: function(orderView) {