From ed52577e1ce44697877a49fbe3c348db864cb40b Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Mon, 7 Dec 2020 13:35:41 +0200 Subject: [PATCH] FIX: Group#flair_url must be a real URL (#11400) It used to be a short URL, but that did not work with the lightbox in {{image-uploader}}. --- app/models/group.rb | 2 +- spec/jobs/migrate_group_flair_images_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/group.rb b/app/models/group.rb index c673afed46a..f4fd4dceab3 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -750,7 +750,7 @@ class Group < ActiveRecord::Base end def flair_url - flair_icon.presence || flair_upload&.short_path + flair_icon.presence || flair_upload&.url end [:muted, :regular, :tracking, :watching, :watching_first_post].each do |level| diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb index cc72d26fa21..d47a5acd30e 100644 --- a/spec/jobs/migrate_group_flair_images_spec.rb +++ b/spec/jobs/migrate_group_flair_images_spec.rb @@ -30,7 +30,7 @@ RSpec.describe Jobs::MigrateGroupFlairImages do group.reload upload = Upload.last expect(group.flair_upload).to eq(upload) - expect(group.flair_url).to eq(upload.short_path) + expect(group.flair_url).to eq(upload.url) expect(group[:flair_url]).to eq(nil) end