Download as
Browse Code »

Commit dbd051c349552b528cd8fa1773fe729650497fac

Authored by Antonio Terceiro
1 parent d8b37cde
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Store id's instead of entire ActiveRecord objects 

(ActionItem1640)
Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
app/controllers/public/invite_controller.rb
  Diff comments   View file @dbd051c
... ... @@ -21,7 +21,7 @@ class InviteController < PublicController
21 21 if !params[:mail_template].match(/<url>/)
22 22 flash.now[:notice] = _('&lt;url&gt; is needed in invitation mail.')
23 23 elsif !contacts_to_invite.empty?
24   - Delayed::Job.enqueue InvitationJob.new(current_user.person, contacts_to_invite, params[:mail_template], profile)
  24 + Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, params[:mail_template], profile.id)
25 25 session[:notice] = _('Your invitations are being sent.')
26 26 if profile.person?
27 27 redirect_to :controller => 'friends'
... ...
lib/invitation_job.rb
  Diff comments   View file @dbd051c
1   -class InvitationJob < Struct.new(:person, :contacts_to_invite, :message, :profile)
  1 +class InvitationJob < Struct.new(:person_id, :contacts_to_invite, :message, :profile_id)
2 2 def perform
3   - Invitation.invite(person, contacts_to_invite, message, profile)
  3 + begin
  4 + person = Person.find(person_id)
  5 + profile = Profile.find(profile_id)
  6 + Invitation.invite(person, contacts_to_invite, message, profile)
  7 + rescue ActiveRecord::NotFound => e
  8 + # ...
  9 + end
4 10 end
5 11 end
... ...