db/migrate/20080805211723_rename_log_item_changes.rb @@ -82,8 +82,13 @@ class PeopleController < ApplicationController @person = Person.find(params[:id]) if @logged_in.can_edit?(@person) if updated = @person.update_from_params(params) - flash[:notice] = 'Changes saved.' - redirect_to edit_person_path(@person, :anchor => params[:anchor]) + respond_to do |format| + format.html do + flash[:notice] = 'Changes saved.' + redirect_to edit_person_path(@person, :anchor => params[:anchor]) + end + format.xml { render :xml => @person.to_xml } + end else edit; render :action => 'edit' end app/controllers/people_controller.rb @@ -42,7 +42,7 @@ class Family < ActiveRecord::Base alias_method 'photo_without_logging=', 'photo=' def photo=(p) - LogItem.create :model_name => 'Family', :instance_id => id, :changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in + LogItem.create :model_name => 'Family', :instance_id => id, :object_changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in self.photo_without_logging = p end app/models/family.rb @@ -67,7 +67,7 @@ class Group < ActiveRecord::Base alias_method 'photo_without_logging=', 'photo=' def photo=(p) - LogItem.create :model_name => 'Group', :instance_id => id, :changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in + LogItem.create :model_name => 'Group', :instance_id => id, :object_changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in self.photo_without_logging = p end app/models/group.rb @@ -25,7 +25,7 @@ class LogItem < ActiveRecord::Base belongs_to :reviewed_by, :class_name => 'Person', :foreign_key => 'reviewed_by' belongs_to :site - serialize :changes + serialize :object_changes acts_as_scoped_globally 'site_id', "(Site.current ? Site.current.id : 'site-not-set')" @@ -95,10 +95,14 @@ class LogItem < ActiveRecord::Base def showable_change_keys return [] if deleted? - changes.keys.select do |key| - PEOPLE_ATTRIBUTES_SHOWABLE_ON_HOMEPAGE.include? key - end.map do |key| - key == 'tv_shows' ? 'TV Shows' : key.split('_').map { |w| w.capitalize }.join(' ') + begin + object_changes.keys.select do |key| + PEOPLE_ATTRIBUTES_SHOWABLE_ON_HOMEPAGE.include? key + end.map do |key| + key == 'tv_shows' ? 'TV Shows' : key.split('_').map { |w| w.capitalize }.join(' ') + end + rescue NoMethodError # sometimes object_changes doesn't un-serialize. Weird. + [] end end app/models/log_item.rb @@ -112,9 +112,11 @@ class Person < ActiveRecord::Base alias_method 'photo_without_logging=', 'photo=' def photo=(p) - LogItem.create :model_name => 'Person', :instance_id => id, :changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in + LogItem.create :model_name => 'Person', :instance_id => id, :object_changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in self.photo_without_logging = p end + + attr_protected :api_key, :feed_code validates_length_of :password, :minimum => 5, :allow_nil => true, :if => Proc.new { Person.logged_in } validates_confirmation_of :password, :if => Proc.new { Person.logged_in } app/models/person.rb @@ -37,7 +37,7 @@ class Recipe < ActiveRecord::Base alias_method 'photo_without_logging=', 'photo=' def photo=(p) - LogItem.create :model_name => 'Recipe', :instance_id => id, :changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in + LogItem.create :model_name => 'Recipe', :instance_id => id, :object_changes => {'photo' => (p ? 'changed' : 'removed')}, :person => Person.logged_in self.photo_without_logging = p end app/models/recipe.rb @@ -89,7 +89,7 @@ <tr id="changes<%= item.id %>" style="display:none;background-color:#eee;" class="changes"> <td colspan="7"> <table> - <% item.changes.to_a.each do |key, value| %> + <% item.object_changes.to_a.each do |key, value| %> <% unless key =~ /_id$/ %> <tr><td><%=h key %>:</td><td><%=h value %></td></tr> <% end %> app/views/administration/log_items/index.html.erb @@ -26,7 +26,7 @@ module Foo :name => self.respond_to?(:name) ? self.name : nil, :model_name => self.class.name, :instance_id => self.id, - :changes => @logger_changes, + :object_changes => @logger_changes, :person => Person.logged_in, :group_id => self.respond_to?(:group_id) ? self.group_id : nil ) vendor/plugins/acts_as_logger/lib/acts_as_logger.rb c07a5659540caa54be9dd050b4836e498addc329 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/647c17b0444485e39045ee62e2ca5ea9ecfc9bea 647c17b0444485e39045ee62e2ca5ea9ecfc9bea 2008-08-05T15:48:00-07:00 2008-08-05T06:14:00-07:00 Rename LogItem#changes attribute to remove conflict with Rails dirty tracking. 09017e9476fcedd0a7239a5f329909919a4d76bf Tim Morgan tim@timmorgan.org