Skip to content

AO3-7524 Site skin dropdown shows Default when using a parent-only skin #5961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evanwhitt wants to merge 3 commits into
base: master
Choose a base branch
from
+20 −1
Open

AO3-7524 Site skin dropdown shows Default when using a parent-only skin #5961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d4a670
AO3-7524 Show current skin in preferences even when parent-only
evanwhitt Aug 3, 2026
ef5439f
AO3-7524 Guard against deleted skin in preferences dropdown
evanwhitt Aug 3, 2026
cff9e4d
Update app/controllers/preferences_controller.rb
evanwhitt Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/preferences_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def update

def available_skins
(@user.skins.site_skins.usable +
Skin.approved_skins.site_skins.usable).uniq
Skin.approved_skins.site_skins.usable +
[@user.preference.skin]).compact.uniq
end
end
18 changes: 18 additions & 0 deletions spec/controllers/preferences_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@
expect(assigns(:available_skins)).to include(usable_skin)
expect(assigns(:available_skins)).not_to include(parent_only_skin)
end

it "includes the user's current skin even if it is parent-only" do
parent_only_skin = create(:skin, author: user, unusable: true)
user.preference.update(skin_id: parent_only_skin.id)

get :index, params: { user_id: user.login }

expect(assigns(:available_skins)).to include(parent_only_skin)
end

it "does not add a nil entry when the user's skin has been deleted" do
user.preference.update(skin_id: 9999)

get :index, params: { user_id: user.login }

expect(assigns(:available_skins)).not_to include(nil)
expect(response).to be_successful
end
end

context "as a guest" do
Expand Down
Loading