Download as
Browse Code »

Commit cc51297159d88b13ac73cb6df64b412c6ac1f9b3

Authored by Weblate
2 parents 283c7d81 661d4188
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

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