Download as
Browse Code »

Commit cc51297159d88b13ac73cb6df64b412c6ac1f9b3

Authored by Weblate
2 parents 283c7d81 661d4188
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

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/mailers/scrap_notifier.rb
  Diff comments   View file @cc51297
1 -class ScrapNotifier < ActionMailer::Base 1 +class Scrap::Notifier < ActionMailer::Base
2 def notification(scrap) 2 def notification(scrap)
3 sender, receiver = scrap.sender, scrap.receiver 3 sender, receiver = scrap.sender, scrap.receiver
4 @recipient = receiver.name 4 @recipient = receiver.name
app/models/scrap.rb
  Diff comments   View file @cc51297
@@ -25,7 +25,7 @@ class Scrap &lt; ActiveRecord::Base @@ -25,7 +25,7 @@ class Scrap &lt; ActiveRecord::Base
25 25
26 after_create do |scrap| 26 after_create do |scrap|
27 scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil? 27 scrap.root.update_attribute('updated_at', DateTime.now) unless scrap.root.nil?
28 - ScrapNotifier.notification(scrap).deliver if scrap.send_notification? 28 + Scrap::Notifier.notification(scrap).deliver if scrap.send_notification?
29 end 29 end
30 30
31 before_validation :strip_all_html_tags 31 before_validation :strip_all_html_tags