Merge pull request spree-contrib#11 from Scoutmob/master

Fix namespacing issue
Scoutmob · Mar 23, 2012 · cefed5e · cefed5e
2 parents c42f048 + db63eb7
commit cefed5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/spree/admin/orders_controller_decorator.rb b/app/controllers/spree/admin/orders_controller_decorator.rb
@@ -1,6 +1,6 @@
 Spree::Admin::OrdersController.class_eval do
   def comments
     load_order
-    @comment_types = CommentType.where(:applies_to => "Order")
+    @comment_types = Spree::CommentType.where(:applies_to => "Order")
   end
 end
diff --git a/app/controllers/spree/admin/shipments_controller_decorator.rb b/app/controllers/spree/admin/shipments_controller_decorator.rb
@@ -1,6 +1,6 @@
 Spree::Admin::ShipmentsController.class_eval do
   def comments
     load_shipment
-    @comment_types = CommentType.where(:applies_to => "Shipment")
+    @comment_types = Spree::CommentType.where(:applies_to => "Shipment")
   end
 end