diff --git a/app/controllers/choices_controller.rb b/app/controllers/choices_controller.rb index 28971dd..9642b01 100644 --- a/app/controllers/choices_controller.rb +++ b/app/controllers/choices_controller.rb @@ -25,7 +25,7 @@ class ChoicesController < InheritedResources::Base end end index! do |format| - format.xml { render :xml => @choices.to_xml(:only => [ :data, :score, :id, :active ])} + format.xml { render :xml => @choices.to_xml(:only => [ :data, :score, :id, :active], :methods => :user_created)} end end diff --git a/app/models/choice.rb b/app/models/choice.rb index 4b2305e..7ef52cf 100644 --- a/app/models/choice.rb +++ b/app/models/choice.rb @@ -75,6 +75,11 @@ class Choice < ActiveRecord::Base self.score = compute_score save! end + + def user_created + self.item.creator_id != self.question.creator_id + end + protected diff --git a/config/environment.rb b/config/environment.rb index 71bbb93..3f2a880 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -9,8 +9,9 @@ require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| # Settings in config/environments/* take precedence over those specified here. - config.time_zone = 'Eastern Time (US & Canada)' + #config.time_zone = 'Eastern Time (US & Canada)' + config.active_record.default_timezone = 'Eastern Time (US & Canada)' #config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :sendmail -- libgit2 0.21.2