Merge branch 'master' of https://github.com/fetsite/fetsite

db/migrate/20130124000300_translate_lvas.rb

@@ -3,13 +3,13 @@ class TranslateLvas < ActiveRecord::Migration
     Lva.create_translation_table!({
       :desc => :text
     }, {
-      #:migrate_data => true
+      :migrate_data => true
     })
     
     
   end
 
   def self.down
-    Lva.drop_translation_table! #:migrate_data => true
+    Lva.drop_translation_table! :migrate_data => true
   end
-end
+end

db/migrate/20130823084252_add_object_to_calentries.rb

@@ -0,0 +1,14 @@
+class AddObjectToCalentries < ActiveRecord::Migration
+  def up
+      add_column :calentries,:object_id, :integer
+      add_column :calentries,:object_type, :string
+      add_column :calentries, :public, :boolean
+      Calentry.update_all(:public => :true)
+  end
+  
+  def down
+		remove_column :calentries, :object_id
+		remove_column :calentries,:object_type
+		remove_column :calentries,:public
+  end
+end

db/migrate/20130823094216_add_public_to_rubrikneuigkeiten.rb

@@ -0,0 +1,9 @@
+class AddPublicToRubrikneuigkeiten < ActiveRecord::Migration
+  def up
+  add_column :rubriken, :public,:boolean
+  Rubrik.update_all(:public => :true)
+  end
+  def down
+  remove_column :rubriken, :public
+  end
+end

db/migrate/20130823114945_add_picture_to_neuigkeiten.rb

@@ -0,0 +1,5 @@
+class AddPictureToNeuigkeiten < ActiveRecord::Migration
+  def change
+  add_column :neuigkeiten,:picture,:string
+  end
+end