Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1

app/controllers/admin/pages_controller.rb

@@ -22,7 +22,7 @@ class Admin::PagesController < ApplicationController
     @item.is_published = true
     @item.parent_id = @parent_item.id rescue nil
     @designs = Design.all.entries
-    @default_design = @designs.detect {|d| d.title.to_s == 'Bob' }
+    @default_design = Design.first
     @default_theme =  @default_design.themes.detect {|t| t.name.to_s == 'default' }
   end
 

app/models/page.rb

@@ -1,7 +1,7 @@
 class Page < Item
   
   field :content
-  field :theme_id
+  field :theme_id, :type => BSON::ObjectId
   
   belongs_to :design
   has_many :page_parts