raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

12698 - keep old UI URL as it is

Browse Source
This commit is contained in:
Ahmed Ejaz
2024-08-13 14:23:39 +05:00
parent e2e3aa9281
commit b14cd08990
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/admin/products_helper.rb
View File

@@ -28,8 +28,12 @@ module Admin
[precised_unit_value, variant.unit_description].compact_blank.join(" ")
end
def products_return_to_url
session[:products_return_to_url] || admin_products_url
def products_return_to_url(url_filters)
if feature?(:admin_style_v3, spree_current_user)
return session[:products_return_to_url] || admin_products_url
end
"#{admin_products_path}#{url_filters.empty? ? '' : "#?#{url_filters.to_query}"}"
end
end
end

4
app/views/spree/admin/products/edit.html.haml
View File

@@ -1,7 +1,7 @@
= admin_inject_available_units
- content_for :page_actions do
%li= button_link_to t('admin.products.back_to_products_list'), products_return_to_url, :icon => 'icon-arrow-left'
%li= button_link_to t('admin.products.back_to_products_list'), products_return_to_url(@url_filters), :icon => 'icon-arrow-left'
%li#new_product_link
= button_link_to t(:new_product), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_product' }
@@ -16,4 +16,4 @@
.form-buttons.filter-actions.actions
= button t(:update), 'icon-refresh'
= button_link_to t(:cancel), products_return_to_url, icon: 'icon-remove'
= button_link_to t(:cancel), products_return_to_url(@url_filters), icon: 'icon-remove'