diff db/migrate/012_add_comments_permissions.rb @ 1526:404aa68d4227

Merge from live branch
author Chris Cannam
date Thu, 11 Sep 2014 12:46:20 +0100
parents 261b3d9a4903
children
line wrap: on
line diff
--- a/db/migrate/012_add_comments_permissions.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/db/migrate/012_add_comments_permissions.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -8,7 +8,7 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'add_comment']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'news', 'destroy_comment']).destroy
+    Permission.where("controller=? and action=?", 'news', 'add_comment').first.destroy
+    Permission.where("controller=? and action=?", 'news', 'destroy_comment').first.destroy
   end
 end