@@ -13,9 +13,7 @@ class Administration::AdminsController < ApplicationController flash[:notice] = "#{person.name} is a Super Administrator." else person.admin = Admin.create! - unless person.save - flash[:warning] = person.errors.full_messages.join('; ') - end + add_errors_to_flash(person) unless person.save end end redirect_to admin_path app/controllers/administration/admins_controller.rb @@ -17,7 +17,7 @@ class Administration::UpdatesController < ApplicationController redirect_to administration_updates_path end else - flash[:warning] = "There was an error saving this update: #{@update.errors.full_messages.join('; ')}" + add_errors_to_flash(@update) index; render :action => 'index' end else app/controllers/administration/updates_controller.rb @@ -91,7 +91,7 @@ class PagesController < ApplicationController if @logged_in.can_edit?(@page) @page.destroy if @page.errors.any? - flash[:warning] = @page.errors.full_messages.join('; ') + add_errors_to_flash(@page) else flash[:notice] = 'Page deleted.' end app/controllers/pages_controller.rb @@ -35,7 +35,7 @@ class PrivaciesController < ApplicationController flash[:warning] = "#{person.name} has been hidden from all pages on this site!" end else - flash[:notice] = person.errors.full_messages.join('; ') + add_errors_to_flash(person) end end elsif params[:family] app/controllers/privacies_controller.rb @@ -32,7 +32,7 @@ class Setup::SitesController < Setup::BaseController flash[:notice] = 'Site updated.' redirect_to setup_sites_url else - flash[:warning] = @site.errors.full_messages.join('; ') + add_errors_to_flash(@site) end end end plugins/setup/lib/setup/sites_controller.rb 774e4c1209c23c99a044f020e90f18929e69f787 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/83b27eba03cce8f001d7b871292e47bb9ac1a512 83b27eba03cce8f001d7b871292e47bb9ac1a512 2008-08-05T08:59:33-07:00 2008-08-05T06:14:00-07:00 Use add_errors_to_flash more consistently. f60e47c0849aa9e637359e511aca85182391eee4 Tim Morgan tim@timmorgan.org