From 35d248ab0d3d5338ae4ddd98960e94b0f5b7df65 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 21 Oct 2016 10:53:58 +1100 Subject: [PATCH] FIX: if badge has an image do not override icon --- app/models/badge.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/badge.rb b/app/models/badge.rb index 9c743f14dd9..6851b210dce 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -129,8 +129,10 @@ class Badge < ActiveRecord::Base end def default_icon=(val) - self.icon ||= val - self.icon = val if self.icon = "fa-certificate" + unless self.image + self.icon ||= val + self.icon = val if self.icon = "fa-certificate" + end end def default_name=(val)