--- a/app/controllers/order_items_controller.rb	Mon Mar 10 03:51:59 2008 +0900
+++ b/app/controllers/order_items_controller.rb	Mon Mar 10 09:55:26 2008 +0900
@@ -1,8 +1,10 @@ class OrderItemsController < Application
 class OrderItemsController < ApplicationController
+  before_filter :assign_session_order
+
   # GET /order_items
   # GET /order_items.xml
   def index
-    @order_items = OrderItem.find(:all)
+    @order_items = @order.items.find(:all)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -13,7 +15,7 @@ class OrderItemsController < Application
   # GET /order_items/1
   # GET /order_items/1.xml
   def show
-    @order_item = OrderItem.find(params[:id])
+    @order_item = @order.items.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -24,7 +26,7 @@ class OrderItemsController < Application
   # GET /order_items/new
   # GET /order_items/new.xml
   def new
-    @order_item = OrderItem.new
+    @order_item = @order.items.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -34,13 +36,13 @@ class OrderItemsController < Application
 
   # GET /order_items/1/edit
   def edit
-    @order_item = OrderItem.find(params[:id])
+    @order_item = @order.items.find(params[:id])
   end
 
   # POST /order_items
   # POST /order_items.xml
   def create
-    @order_item = OrderItem.new(params[:order_item])
+    @order_item = @order.items.new(params[:order_item])
 
     respond_to do |format|
       if @order_item.save
@@ -57,7 +59,7 @@ class OrderItemsController < Application
   # PUT /order_items/1
   # PUT /order_items/1.xml
   def update
-    @order_item = OrderItem.find(params[:id])
+    @order_item = @order.items.find(params[:id])
 
     respond_to do |format|
       if @order_item.update_attributes(params[:order_item])
@@ -74,7 +76,7 @@ class OrderItemsController < Application
   # DELETE /order_items/1
   # DELETE /order_items/1.xml
   def destroy
-    @order_item = OrderItem.find(params[:id])
+    @order_item = @order.items.find(params[:id])
     @order_item.destroy
 
     respond_to do |format|
@@ -82,4 +84,13 @@ class OrderItemsController < Application
       format.xml  { head :ok }
     end
   end
+
+  private
+    def assign_session_order
+      unless session[:order_id].blank?
+	@order = Order.find(session[:order_id])
+      else
+	@order = Order.create
+      end
+    end
 end