Merge branch 'hotfix/0.4.2_fix.2'

* hotfix/0.4.2_fix.2: fix profile avatar for questionary
ulmic · Sep 17, 2015 · c96de59 · c96de59
2 parents 107ba36 + 12fb66b
commit c96de59
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/decorators/questionary_decorator.rb b/app/decorators/questionary_decorator.rb
@@ -1,3 +1,7 @@
 class QuestionaryDecorator < MemberDecorator
   delegate_all
+
+  def profile_avatar
+    object.on_the_trial? ? avatar.profile : default_avatar
+  end
 end