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

Jump to bottom

[Admin] Add stock_items/edit modal component #5543

Merged
merged 9 commits into from
Dec 12, 2023
Merged

[Admin] Add stock_items/edit modal component #5543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
670814c
Add new `ui/resource_item` component
rainerdema Dec 7, 2023
5ac3ac6
Add new `ui/switch_field` component
rainerdema Dec 7, 2023
6383bcc
Enable logging for view components
rainerdema Dec 7, 2023
5b15958
Introduce stock movements column in stock items index
rainerdema Dec 7, 2023
db985f2
Add missing translation in stock items index image column
rainerdema Dec 7, 2023
3f588ef
Introude new edit and update action for stock item records
rainerdema Dec 7, 2023
dc8cfdf
Introduce new `stock_items/edit` component
rainerdema Dec 7, 2023
d2e55ee
Implement redirect to previous page after stock item saving
rainerdema Dec 7, 2023
29e3134
Don't use the same name for a circleci job and command
elia Dec 11, 2023
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
Prev Previous commit
Next Next commit
Implement redirect to previous page after stock item saving 
Co-Authored-By: Elia Schito <[email protected]>
  • Loading branch information
@rainerdema @elia
rainerdema and elia committed Dec 11, 2023
commit d2e55eebaa8fb115fd6eccf971a43db5e83d0f27
8 changes: 8 additions & 0 deletions admin/app/components/solidus_admin/stock_items/edit/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@
checked: f.object.backorderable?,
include_hidden: true,
) %>

<% if params[:q] %>
<%= f.hidden_field :q, value: params[:q].to_json, id: false %>
<% end %>

<% if params[:page] %>
<%= f.hidden_field :page, value: params[:page], id: false %>
<% end %>
</div>
<% end %>

Expand Down
5 changes: 4 additions & 1 deletion admin/app/controllers/solidus_admin/stock_items_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ def update
@stock_item.stock_movements.build(quantity: quantity_adjustment, originator: current_solidus_admin_user)

if @stock_item.save
redirect_to solidus_admin.stock_items_path, status: :see_other
redirect_to solidus_admin.stock_items_path(
page: stock_item_params[:page].to_i.presence,
q: stock_item_params[:q].presence&.then { |q| JSON.parse(q) }
), status: :see_other
else
respond_to do |format|
format.html { render component('stock_items/edit').new(stock_item: @stock_item, page: @page), status: :unprocessable_entity }
Expand Down