IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:16:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: do not fallback to flair_url column

Browse Source 
flair_url is not loaded by our query anymore so avoid falling back
to the old value
This commit is contained in:
Sam Saffron 2020-05-25 16:25:42 +10:00
parent 47c6fe9bfa
commit c011b817b2
No known key found for this signature in database
GPG Key ID: B9606168D2FFD9F5
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/group.rb
View File

@ -748,7 +748,7 @@ class Group < ActiveRecord::Base
end
def flair_url
flair_icon.presence || flair_upload&.url || self[:flair_url].presence
flair_icon.presence || flair_upload&.url
end
protected

18
spec/models/group_spec.rb
View File

@ -972,24 +972,6 @@ describe Group do
end
end
it "allows Font Awesome 4.7 syntax as group avatar flair" do
group = Fabricate(:group)
group.flair_url = "fa-air-freshener"
group.save
group = Group.find(group.id)
expect(group.flair_url).to eq("fa-air-freshener")
end
it "allows Font Awesome 5 syntax as group avatar flair" do
group = Fabricate(:group)
group.flair_url = "fab fa-bandcamp"
group.save
group = Group.find(group.id)
expect(group.flair_url).to eq("fab fa-bandcamp")
end
context "Unicode usernames and group names" do
before { SiteSetting.unicode_usernames = true }