diff --git a/app/controllers/admin/assets_controller.rb b/app/controllers/admin/assets_controller.rb index d07d6a43..61ef4d9b 100644 --- a/app/controllers/admin/assets_controller.rb +++ b/app/controllers/admin/assets_controller.rb @@ -10,7 +10,7 @@ class Admin::AssetsController < ApplicationController end def index - @assets = Asset.find(:all) + @assets = Asset.all end def edit diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index e232732b..2ba3ad56 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -1,7 +1,7 @@ class AnnouncementsController < ApplicationController def index - @announcements = Announcement.find(:all, :conditions => { :entry_name => params[:entry_name] }) + @announcements = Announcement.all( :conditions => { :entry_name => params[:entry_name] }) respond_to do |format| format.html { diff --git a/app/controllers/panel/announcements_controller.rb b/app/controllers/panel/announcements_controller.rb index 243a1329..9bbcc051 100644 --- a/app/controllers/panel/announcements_controller.rb +++ b/app/controllers/panel/announcements_controller.rb @@ -5,7 +5,7 @@ class Panel::AnnouncementsController < ApplicationController layout "admin" def index - @announcements = Announcement.find(:all, :conditions => { :entry_name => params[:entry_name] }) + @announcements = Announcement.all( :conditions => { :entry_name => params[:entry_name] }) end def new diff --git a/app/models/item.rb b/app/models/item.rb index db643770..eb63113c 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -28,7 +28,7 @@ class Item end def self.find_by_name(item_name) - Item.find(:first, :conditions => { :name => item_name, :is_published => true }) + Item.first(:conditions => { :name => item_name, :is_published => true }) end def ancestors