Merge remote branch 'manuels/842-sortable-aspects'

Conflicts:
	app/models/user.rb
	db/schema.rb

2 files changed, 11 insertions, 1 deletions

diff --git a/db/migrate/20110710102747_add_order_id_to_aspects.rb b/db/migrate/20110710102747_add_order_id_to_aspects.rb
new file mode 100644
index 000000000..ab70b1d32
--- /dev/null
+++ b/db/migrate/20110710102747_add_order_id_to_aspects.rb
@@ -0,0 +1,9 @@
+class AddOrderIdToAspects < ActiveRecord::Migration
+  def self.up
+    add_column :aspects, :order_id, :integer
+  end
+
+  def self.down
+    remove_column :aspects, :order_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4ce633fcb..02a0cb94c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110707234802) do
+ActiveRecord::Schema.define(:version => 20110710102747) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false
@@ -40,6 +40,7 @@ ActiveRecord::Schema.define(:version => 20110707234802) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "contacts_visible", :default => true, :null => false
+    t.integer  "order_id"
   end
 
   add_index "aspects", ["user_id", "contacts_visible"], :name => "index_aspects_on_user_id_and_contacts_visible"