# HG changeset patch
# User jittat <jittat@6386c4cd-e34a-4fa8-8920-d93eb39b512e>
# Date 2008-12-11 15:41:59
# Node ID edaacd4ec8e9ae09d816ba9d851ef8871a9f8041
# Parent  0138848b0c5bf8ffbf443e274441c7ebe350fd18

MERGE changeset 306:307 from branch ytopc08-2 that fixes migration bug

git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@308 6386c4cd-e34a-4fa8-8920-d93eb39b512e

diff --git a/db/migrate/010_add_admin_and_roles.rb b/db/migrate/010_add_admin_and_roles.rb
--- a/db/migrate/010_add_admin_and_roles.rb
+++ b/db/migrate/010_add_admin_and_roles.rb
@@ -9,6 +9,9 @@
 
     class << root
       public :encrypt_new_password
+      def valid?
+        true
+      end
     end
 
     root.encrypt_new_password
diff --git a/db/migrate/025_add_site_to_user_and_add_default_site.rb b/db/migrate/025_add_site_to_user_and_add_default_site.rb
--- a/db/migrate/025_add_site_to_user_and_add_default_site.rb
+++ b/db/migrate/025_add_site_to_user_and_add_default_site.rb
@@ -8,6 +8,13 @@
     User.reset_column_information
 
     User.find(:all).each do |user|
+
+      class << user
+        def valid?
+          true
+        end
+      end
+
       user.site_id = default_site.id
       user.save
     end
diff --git a/db/migrate/031_add_supports_for_output_only_problems.rb b/db/migrate/031_add_supports_for_output_only_problems.rb
--- a/db/migrate/031_add_supports_for_output_only_problems.rb
+++ b/db/migrate/031_add_supports_for_output_only_problems.rb
@@ -6,6 +6,6 @@
 
   def self.down
     remove_column :submissions, :source_filename
-    add_column :problems, :output_only, :boolean
+    remove_column :problems, :output_only
   end
 end
diff --git a/db/migrate/20081204122651_add_activated_to_users.rb b/db/migrate/20081204122651_add_activated_to_users.rb
--- a/db/migrate/20081204122651_add_activated_to_users.rb
+++ b/db/migrate/20081204122651_add_activated_to_users.rb
@@ -2,6 +2,8 @@
   def self.up
     add_column :users, :activated, :boolean, :default => 0
 
+    User.reset_column_information
+
     User.find(:all).each do |user|
 
       # disable validation