github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:23:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not show flair bg color if flair is not visible (#13969)

Browse Source 
follow up to fe3e18f981
This commit is contained in:
Arpit Jalan 2021-08-06 20:53:23 +05:30 committed by GitHub
parent b66674fec2
commit 0d8fd9ace6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/models/group.rb
View File

@ -803,19 +803,20 @@ class Group < ActiveRecord::Base
end
def flair_url
if members_visibility_level == Group.visibility_levels[:public] &&
visibility_level == Group.visibility_levels[:public]
case flair_type
when :icon
flair_icon
when :image
upload_cdn_path(flair_upload.url)
else
nil
end
else
nil
end
return if members_visibility_level != Group.visibility_levels[:public]
return if visibility_level != Group.visibility_levels[:public]
return flair_icon if flair_type == :icon
return upload_cdn_path(flair_upload.url) if flair_type == :image
nil
end
def flair_bg_color
return if members_visibility_level != Group.visibility_levels[:public]
return if visibility_level != Group.visibility_levels[:public]
read_attribute(:flair_bg_color)
end
[:muted, :regular, :tracking, :watching, :watching_first_post].each do |level|

3
spec/components/user_lookup_spec.rb
View File

@ -55,7 +55,7 @@ describe UserLookup do
end
describe '#flair_groups' do
fab!(:group) { Fabricate(:group, name: "flair_group", flair_icon: "icon", visibility_level: Group.visibility_levels[:public], members_visibility_level: Group.visibility_levels[:public]) }
fab!(:group) { Fabricate(:group, name: "flair_group", flair_icon: "icon", flair_bg_color: "40E0D0", visibility_level: Group.visibility_levels[:public], members_visibility_level: Group.visibility_levels[:public]) }
fab!(:user2) { Fabricate(:user, flair_group: group) }
before do
@ -79,6 +79,7 @@ describe UserLookup do
expect(user_lookup_group).to eq(group)
expect(user_lookup_group.name).to eq("flair_group")
expect(user_lookup_group.flair_url).to eq("icon")
expect(user_lookup_group.flair_bg_color).to eq("40E0D0")
end
end
end

6
spec/models/group_spec.rb
View File

@ -1310,10 +1310,12 @@ describe Group do
end
it "fetches flair_url based on group visibility" do
public_group = Fabricate(:group, flair_icon: "icon", visibility_level: Group.visibility_levels[:public], members_visibility_level: Group.visibility_levels[:public])
private_group = Fabricate(:group, flair_icon: "icon", visibility_level: Group.visibility_levels[:logged_on_users], members_visibility_level: Group.visibility_levels[:public])
public_group = Fabricate(:group, flair_icon: "icon", flair_bg_color: "40E0D0", visibility_level: Group.visibility_levels[:public], members_visibility_level: Group.visibility_levels[:public])
private_group = Fabricate(:group, flair_icon: "icon", flair_bg_color: "40E0D0", visibility_level: Group.visibility_levels[:logged_on_users], members_visibility_level: Group.visibility_levels[:public])
expect(public_group.flair_url).to eq("icon")
expect(private_group.flair_url).to eq(nil)
expect(public_group.flair_bg_color).to eq("40E0D0")
expect(private_group.flair_bg_color).to eq(nil)
end
end

8
spec/requests/groups_controller_spec.rb
View File

@ -723,7 +723,7 @@ describe GroupsController do
group.reload
expect(group.flair_bg_color).to eq('FFF')
expect(group.flair_bg_color).to eq(nil)
expect(group.flair_color).to eq('BBB')
expect(group.flair_url).to eq(nil)
expect(group.bio_raw).to eq('testing')
@ -834,9 +834,10 @@ describe GroupsController do
expect(response.status).to eq(200)
group.reload
expect(group.flair_bg_color).to eq('FFF')
expect(group.flair_bg_color).to eq(nil)
expect(group.flair_color).to eq('BBB')
expect(group.flair_icon).to eq('fa-adjust')
expect(group.flair_url).to eq(nil)
expect(group.name).to eq('admins')
expect(group.visibility_level).to eq(1)
expect(group.mentionable_level).to eq(1)
@ -1005,9 +1006,10 @@ describe GroupsController do
expect(response.status).to eq(200)
group.reload
expect(group.flair_bg_color).to eq('FFF')
expect(group.flair_bg_color).to eq(nil)
expect(group.flair_color).to eq('BBB')
expect(group.flair_icon).to eq('fa-adjust')
expect(group.flair_url).to eq(nil)
expect(group.name).to eq('trust_level_4')
expect(group.mentionable_level).to eq(1)
expect(group.messageable_level).to eq(1)