Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve links further on admin side.

Matthew Kennedy0b76aadc7740
diff --git a/backend/app/views/spree/admin/cms_sections/types/_side_by_side_promotion.html.erb b/backend/app/views/spree/admin/cms_sections/types/_side_by_side_promotion.html.erb
index af4e70fa92..a6a56cda14 100644
--- a/backend/app/views/spree/admin/cms_sections/types/_side_by_side_promotion.html.erb
+++ b/backend/app/views/spree/admin/cms_sections/types/_side_by_side_promotion.html.erb
@@ -40,7 +40,7 @@
data: { target_field: :link_one}) %>
<%= f.error_message_on :link_type_one %>
<% end %>
- <%= render "spree/admin/shared/cms/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_one, save_to: :link_one, f: f %>
+ <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_one, save_to: :link_one, f: f %>
<small class="text-muted"><%= Spree.t('admin.cms.side_by_side.section_one_info') %></small>
</div>
@@ -87,7 +87,7 @@
data: { target_field: :link_two}) %>
<%= f.error_message_on :link_type_two %>
<% end %>
- <%= render "spree/admin/shared/cms/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_two, save_to: :link_two, f: f %>
+ <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_two, save_to: :link_two, f: f %>
<small class="text-muted"><%= Spree.t('admin.cms.side_by_side.section_two_info') %></small>
</div>
diff --git a/backend/app/views/spree/admin/shared/_link_fields.html.erb b/backend/app/views/spree/admin/shared/_link_fields.html.erb
index 256978c8bd..cbcca53ce4 100644
--- a/backend/app/views/spree/admin/shared/_link_fields.html.erb
+++ b/backend/app/views/spree/admin/shared/_link_fields.html.erb
@@ -1,10 +1,17 @@
-<% if resource.linked_resource_type.present? %>
- <div data-panel-type="<%= resource.linked_resource_type %>" data-panel-id="menu_item_link">
+<% save_to = save_to || 'menu_item_link' %>
+<% linked_type = linked_type || nil %>
+
+<% if linked_type.present? %>
+ <div data-panel-type="<%= linked_type %>" data-panel-id="<%= save_to %>">
+ <%= render "spree/admin/shared/cms/#{spree_class_name_as_path(linked_type)}", resource: resource, save_to: save_to, f: f %>
+ </div>
+<% elsif resource.linked_resource_type.present? %>
+ <div data-panel-type="<%= resource.linked_resource_type %>" data-panel-id="<%= save_to %>">
<%= render "spree/admin/shared/linkables/#{spree_class_name_as_path(resource.linked_resource_type)}", resource: resource, f: f %>
</div>
<% end %>
-<div class="d-none" data-target-message-pannel="menu_item_link">
+<div class="d-none" data-target-message-pannel="<%= save_to %>">
<div class="alert alert-warning mt-3">
<% if %w[new create].include? controller.action_name %>
<%= raw Spree.t('admin.navigation.click_create_to_load_new_link') %>
diff --git a/backend/app/views/spree/admin/shared/cms/_link_fields.html.erb b/backend/app/views/spree/admin/shared/cms/_link_fields.html.erb
deleted file mode 100644
index c069d3d1c5..0000000000
--- a/backend/app/views/spree/admin/shared/cms/_link_fields.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% if linked_type.present? && linked_type.present? %>
- <div data-panel-type="<%= linked_type %>" data-panel-id="<%= save_to %>">
- <%= render "spree/admin/shared/cms/#{spree_class_name_as_path(linked_type)}", resource: resource, save_to: save_to, f: f %>
- </div>
-<% end %>
-
-<div class="d-none" data-target-message-pannel="<%= save_to %>">
- <div class="alert alert-warning mt-3">
- <% if %w[new create].include? controller.action_name %>
- <%= raw Spree.t('admin.navigation.click_create_to_load_new_link') %>
- <% else %>
- <%= raw Spree.t('admin.navigation.click_update_to_load_new_link') %>
- <% end %>
- </div>
-</div>