Download as
Browse Code »

Commit cb82846fcbfbd39f8e7b4a437b4c7a7696f335af

Authored by Victor Costa
1 parent 1b31877e
Exists in master and in 1 other branch fix_pontuation_check

Fix pending badges notification

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
lib/gamification_plugin.rb
  Diff comments   View file @cb82846
@@ -36,7 +36,7 @@ class GamificationPlugin < Noosfero::Plugin @@ -36,7 +36,7 @@ class GamificationPlugin < Noosfero::Plugin
36 def body_ending 36 def body_ending
37 proc do 37 proc do
38 if current_person.present? && response.status == 200 38 if current_person.present? && response.status == 200
39 - badges = current_person.badges.notification_pending.all 39 + badges = current_person.badges.notification_pending
40 current_person.sash.notify_all_badges_from_user 40 current_person.sash.notify_all_badges_from_user
41 render :file => 'gamification/display_notifications', :locals => {:badges => badges} 41 render :file => 'gamification/display_notifications', :locals => {:badges => badges}
42 else 42 else
lib/gamification_plugin/badge.rb
  Diff comments   View file @cb82846
@@ -18,6 +18,6 @@ class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord @@ -18,6 +18,6 @@ class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord
18 Merit::BadgesSash.where(:badge_id => self.id).destroy_all 18 Merit::BadgesSash.where(:badge_id => self.id).destroy_all
19 end 19 end
20 20
21 - scope :notification_pending, :joins => :badges_sash, :conditions => ['badges_sashes.notified_user = false'] 21 + scope :notification_pending, :include => :badges_sash, :conditions => ['badges_sashes.notified_user = false']
22 22
23 end 23 end