Skip to content

AO3-6390 Remove the field for setting the default skin on the admin skins page #5815

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
brianjaustin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AO3-6390 Remove the field for setting the default skin on the admin skins page #5815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions app/controllers/admin/skins_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,6 @@ def update

flash[:notice] << ts("The following skins were updated: %{titles}", titles: modified_skin_titles.join(', '))

# set default
if params[:set_default].present? && params[:set_default] != AdminSetting.default_skin&.title
authorize Skin, :set_default?

skin = Skin.find_by(title: params[:set_default], official: true)
@admin_setting = AdminSetting.first
if skin && @admin_setting
@admin_setting.default_skin = skin
@admin_setting.last_updated_by = params[:last_updated_by]
if @admin_setting.save
flash[:notice] << ts("Default skin changed to %{title}", title: skin.title)
else
flash[:error] = ts("We couldn't save the default skin change.")
end
end
end

redirect_to admin_skins_path
end

Expand Down
4 changes: 0 additions & 4 deletions app/policies/skin_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ def update?
user_has_roles?(MANAGE_WORK_SKINS) && @record.is_a?(WorkSkin)
end

def set_default?
user_has_roles?(MANAGE_SITE_SKINS)
end

alias index_approved? index?
alias index_rejected? index?
end
13 changes: 0 additions & 13 deletions app/views/admin/skins/index_approved.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,6 @@
</table>
</fieldset>

<% if policy(Skin).set_default? %>
<fieldset>
<legend><%= ts("Set Default Archive Skin") %></legend>
<h3 class="heading"><%= ts("Set Default Archive Skin") %></h3>
<p class="note"><%= ts("This will change the default skin FOR ALL USERS! Don't use unless you are REALLY SURE.") %></p>
<p>
<%= label_tag "set_default", ts("Default Skin Title: ") %>
<%= text_field_tag "set_default", AdminSetting.default_skin.try(:title), autocomplete_options("site_skins", data: { autocomplete_token_limit: 1 }) %>
<%= hidden_field_tag :last_updated_by, current_admin.id %>
</p>
</fieldset>
<% end %>

<p class="submit"><%= submit_tag ts("Update") %></p>

<% end %>
Expand Down
23 changes: 0 additions & 23 deletions features/admins/admin_skins.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,29 +115,6 @@ Feature: Admin manage skins
And I should not see "#title"
And I should not see "text-decoration: blink;"

Scenario: Admin can change the default skin
Given basic skins
And the approved public skin "strange skin" with css "#title { text-decoration: underline;}"
And the approved public skin "public skin" with css "#title { text-decoration: blink;}"
And I am logged in as "skinner"
And the user "KnownUser" exists and is activated
When I am on skinner's preferences page
And I select "strange skin" from "preference_skin_id"
And I submit
Then I should see "{ text-decoration: underline; }" in the page style
When I am logged in as a "superadmin" admin
Then I should not see "{ text-decoration: blink; }" in the page style
When I follow "Approved Skins"
And I fill in "set_default" with "public skin"
And I press "Update"
Then I should see "Default skin changed to public skin"
And I should see "{ text-decoration: blink; }" in the page style
When I am logged in as "skinner"
Then I should see "{ text-decoration: underline; }" in the page style
# A user created before changing the default skin will still have the same skin
When I am logged in as "KnownUser"
Then I should not see "{ text-decoration: blink; }" in the page style

Scenario: Admin can edit a skin with the word "archive" in the title
Given the approved public skin "official archive skin" has reserved words in the title
And I am logged in as a "superadmin" admin
Expand Down
36 changes: 0 additions & 36 deletions spec/controllers/admin/skins_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,38 +118,6 @@
let(:site_skin) { create(:skin, :public) }
let(:work_skin) { create(:work_skin, :public) }

shared_examples "unauthorized admin cannot update default skin" do
before { site_skin.update!(official: true) }

it "does not modify the default skin" do
expect do
put :update, params: { id: :update, set_default: site_skin.title, last_updated_by: admin.id }
end.not_to change { AdminSetting.first.default_skin }
end

it "redirects with error" do
put :update, params: { id: :update, set_default: site_skin.title, last_updated_by: admin.id }
it_redirects_to_simple(root_path)
expect(flash[:error]).to eq("Sorry, only an authorized admin can access the page you were trying to reach.")
end
end

shared_examples "authorized admin can update default skin" do
before { site_skin.update!(official: true) }

it "modifies the default skin" do
expect do
put :update, params: { id: :update, set_default: site_skin.title, last_updated_by: admin.id }
end.to change { AdminSetting.first.default_skin }.from(nil).to(site_skin)
end

it "redirects with notice" do
put :update, params: { id: :update, set_default: site_skin.title, last_updated_by: admin.id }
it_redirects_to_simple(admin_skins_path)
expect(flash[:notice]).to include("Default skin changed to #{site_skin.title}")
end
end

shared_examples "unauthorized admin cannot update site skin" do
it "does not modify site skin" do
expect do
Expand Down Expand Up @@ -205,7 +173,6 @@
end

context "when admin has no role" do
it_behaves_like "unauthorized admin cannot update default skin"
it_behaves_like "unauthorized admin cannot update site skin"
it_behaves_like "unauthorized admin cannot update work skin"
end
Expand All @@ -214,7 +181,6 @@
context "when admin has #{role} role" do
let(:admin) { create(:admin, roles: [role]) }

it_behaves_like "unauthorized admin cannot update default skin"
it_behaves_like "unauthorized admin cannot update site skin"
it_behaves_like "unauthorized admin cannot update work skin"
end
Expand All @@ -223,7 +189,6 @@
context "when admin has superadmin role" do
let(:admin) { create(:admin, roles: ["superadmin"]) }

it_behaves_like "authorized admin can update default skin"
it_behaves_like "authorized admin can update site skin"
it_behaves_like "authorized admin can update work skin"

Expand All @@ -250,7 +215,6 @@
context "when admin has support role" do
let(:admin) { create(:admin, roles: ["support"]) }

it_behaves_like "unauthorized admin cannot update default skin"
it_behaves_like "authorized admin can update work skin"

context "when attempting to update a site skin" do
Expand Down
Loading