Skip to content
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

[v4.4] Fix admin promotions controller #6020

Merged
merged 2 commits into from
Dec 6, 2024
Merged

[v4.4] Fix admin promotions controller #6020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b0b91
Add `#authorization_subject` to Promotions controllers
mamhoff Nov 19, 2024
7eb5178
Fix admin promotions controller
mamhoff Nov 19, 2024
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
10 changes: 6 additions & 4 deletions promotions/lib/components/admin/solidus_promotions/promotions/index/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def search_url
end

def row_url(promotion)
solidus_promotions.admin_promotion_path(promotion)
solidus_promotions.edit_admin_promotion_path(promotion)
end

def page_actions
Expand Down Expand Up @@ -63,14 +63,16 @@ def columns
{
header: :name,
data: ->(promotion) do
content_tag :div, promotion.name
link_to promotion.name, row_url(promotion)
end
},
{
header: :code,
data: ->(promotion) do
count = promotion.codes.count
(count == 1) ? promotion.codes.pick(:value) : t("spree.number_of_codes", count: count)
link_to solidus_promotions.admin_promotion_promotion_codes_path(promotion), title: t(".codes") do
count = promotion.codes.count
(count == 1) ? promotion.codes.pick(:value) : t("spree.number_of_codes", count: count)
end
end
},
{
Expand Down
1 change: 1 addition & 0 deletions promotions/lib/components/admin/solidus_promotions/promotions/index/component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ en:
status:
active: Active
inactive: Inactive
codes: Codes
6 changes: 6 additions & 0 deletions promotions/lib/controllers/admin/solidus_promotions/promotion_categories_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,11 @@ def destroy
flash[:notice] = t(".success")
redirect_back_or_to solidus_promotions.promotion_categories_path, status: :see_other
end

private

def authorization_subject
SolidusPromotions::PromotionCategory
end
end
end
4 changes: 4 additions & 0 deletions promotions/lib/controllers/admin/solidus_promotions/promotions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,9 @@ def load_promotion
def promotion_params
params.require(:promotion).permit(:user_id, permitted_promotion_attributes)
end

def authorization_subject
SolidusPromotions::Promotion
end
end
end
4 changes: 4 additions & 0 deletions promotions/spec/system/solidus_promotions/admin/promotions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,9 @@
expect(page).to have_content("Promotions were successfully removed.")
expect(page).not_to have_content("My active Promotion")
expect(SolidusPromotions::Promotion.count).to eq(3)

click_link("My future Promotion")
expect(page).to have_content("My future Promotion")
expect(page).to have_content("Starts at")
end
end
Loading