From 0f064c2f9ece18719deeb81cdaf30d989dc747d4 Mon Sep 17 00:00:00 2001
From: Wolfgang Vogl <wuulf01@yahoo.de>
Date: Wed, 25 May 2011 20:48:08 +0200
Subject: [PATCH] migration fixes

---
 app/controllers/meal_arrangements_controller.rb       | 2 +-
 app/controllers/meals_controller.rb                   | 2 +-
 app/models/meal.rb                                    | 6 ------
 app/models/meal_arrangement.rb                        | 6 ------
 db/migrate/20110413133754_create_meals.rb             | 2 +-
 db/migrate/20110419142401_create_fellowships.rb       | 2 +-
 db/migrate/20110419152953_create_meal_arrangements.rb | 4 ++--
 db/schema.rb                                          | 8 ++++----
 8 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/controllers/meal_arrangements_controller.rb b/app/controllers/meal_arrangements_controller.rb
index 9c1a400..ac97902 100644
--- a/app/controllers/meal_arrangements_controller.rb
+++ b/app/controllers/meal_arrangements_controller.rb
@@ -68,7 +68,7 @@ def destroy
 
   private
   def get_meal
-    @meal_arrangement = MealArrangement.get_meal_arrangement params[:id]
+    @meal_arrangement = MealArrangement.find(params[:id])
   end
 
   def check_user
diff --git a/app/controllers/meals_controller.rb b/app/controllers/meals_controller.rb
index 331b11a..0867b19 100644
--- a/app/controllers/meals_controller.rb
+++ b/app/controllers/meals_controller.rb
@@ -5,7 +5,7 @@ class MealsController < ApplicationController
   
   def index
    @coords = request.location;
-   @user_meals = Meal.get_user_meal current_user.id if current_user
+   @user_meals = Meal.find(:all, :conditions => ["user_id = ?", current_user.id]) if current_user
   end
 
   def new 
diff --git a/app/models/meal.rb b/app/models/meal.rb
index 834877d..1e420b5 100644
--- a/app/models/meal.rb
+++ b/app/models/meal.rb
@@ -20,10 +20,4 @@ class Meal < ActiveRecord::Base
   
 #  acts_as_commentable
 
-  def self.get_user_meal arg
-    where(:user_id => arg)
-  end
-
-
-
 end
diff --git a/app/models/meal_arrangement.rb b/app/models/meal_arrangement.rb
index 0baf194..461731b 100644
--- a/app/models/meal_arrangement.rb
+++ b/app/models/meal_arrangement.rb
@@ -12,12 +12,6 @@ class MealArrangement < ActiveRecord::Base
   belongs_to :user
   belongs_to :meal
   
-  def self.get_meal_arrangement arg
-    where(:id => arg)
-  end
 
-  def self.get_meal_arrangement_from_user_and_meal args
-    #where(:meal_id => args[0] AND :user_id => args[1]).first
-  end
 
 end
diff --git a/db/migrate/20110413133754_create_meals.rb b/db/migrate/20110413133754_create_meals.rb
index ab7634f..cb76a7d 100644
--- a/db/migrate/20110413133754_create_meals.rb
+++ b/db/migrate/20110413133754_create_meals.rb
@@ -17,7 +17,7 @@ def self.up
       t.timestamps
     end
 
-      add_index :meals, :user_id,           :unique => true
+      add_index :meals, :user_id
   end
 
 
diff --git a/db/migrate/20110419142401_create_fellowships.rb b/db/migrate/20110419142401_create_fellowships.rb
index ae4f9d8..a5d28a6 100644
--- a/db/migrate/20110419142401_create_fellowships.rb
+++ b/db/migrate/20110419142401_create_fellowships.rb
@@ -6,7 +6,7 @@ def self.up
 
       t.timestamps
     end
-      add_index :fellowships, :user_id,                :unique => true
+      add_index :fellowships, :user_id
   end
 
 
diff --git a/db/migrate/20110419152953_create_meal_arrangements.rb b/db/migrate/20110419152953_create_meal_arrangements.rb
index 62e84c6..fcacc4a 100644
--- a/db/migrate/20110419152953_create_meal_arrangements.rb
+++ b/db/migrate/20110419152953_create_meal_arrangements.rb
@@ -8,8 +8,8 @@ def self.up
       t.timestamps
     end
 
-  add_index :meal_arrangements, :meal_id,                :unique => true
-  add_index :meal_arrangements, :user_id,                :unique => true
+  add_index :meal_arrangements, :meal_id
+  add_index :meal_arrangements, :user_id
 
   end
 
diff --git a/db/schema.rb b/db/schema.rb
index 77a746d..38647b2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -36,7 +36,7 @@
     t.datetime "updated_at"
   end
 
-  add_index "fellowships", ["user_id"], :name => "index_fellowships_on_user_id", :unique => true
+  add_index "fellowships", ["user_id"], :name => "index_fellowships_on_user_id"
 
   create_table "meal_arrangements", :force => true do |t|
     t.integer  "meal_id"
@@ -46,8 +46,8 @@
     t.boolean  "acceptance"
   end
 
-  add_index "meal_arrangements", ["meal_id"], :name => "index_meal_arrangements_on_meal_id", :unique => true
-  add_index "meal_arrangements", ["user_id"], :name => "index_meal_arrangements_on_user_id", :unique => true
+  add_index "meal_arrangements", ["meal_id"], :name => "index_meal_arrangements_on_meal_id"
+  add_index "meal_arrangements", ["user_id"], :name => "index_meal_arrangements_on_user_id"
 
   create_table "meals", :force => true do |t|
     t.string   "title"
@@ -67,7 +67,7 @@
     t.integer  "slots"
   end
 
-  add_index "meals", ["user_id"], :name => "index_meals_on_user_id", :unique => true
+  add_index "meals", ["user_id"], :name => "index_meals_on_user_id"
 
   create_table "messages", :force => true do |t|
     t.string  "topic"