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.

Move validations on cms_page model.

Matthew Kennedy69d69bb333bd
diff --git a/backend/app/helpers/spree/admin/cms_helper.rb b/backend/app/helpers/spree/admin/cms_helper.rb
index 5dae3912eb..b001bb7795 100644
--- a/backend/app/helpers/spree/admin/cms_helper.rb
+++ b/backend/app/helpers/spree/admin/cms_helper.rb
@@ -10,11 +10,11 @@ module Spree
end
fit = case section.fit
- when 'Screen'
- 'edge'
- else
- ''
- end
+ when 'Screen'
+ 'edge'
+ else
+ ''
+ end
render 'spree/admin/cms_pages/section_template',
section: section,
diff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erb
index 96c42507e1..91b74feb37 100644
--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb
@@ -12,65 +12,65 @@
<% end %>
<% if @cms_page.sections? %>
-<div class="row">
- <div id="pageSectionsArea" class="col-12">
+ <div class="row">
+ <div id="pageSectionsArea" class="col-12">
- <hr class="mt-4 hide-on-full-screen-mode">
- <div class="row">
- <div class="col d-flex justify-content-start">
- <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
- </div>
- <div class="col d-none d-md-flex justify-content-end">
- <div id="LiveViewSwitcher" class="btn-group btn-group-toggle" data-toggle="buttons">
- <label class="btn btn-outline-primary active">
- <input type="radio" name="options" id="mobileLiveView" autocomplete="off"> Mobile
- </label>
- <label class="btn btn-outline-primary">
- <input type="radio" name="options" id="tabletLiveView" autocomplete="off"> Tablet
- </label>
- <label class="btn btn-outline-primary">
- <input type="radio" name="options" id="desktopLiveView" autocomplete="off" checked> Desktop
- </label>
+ <hr class="mt-4 hide-on-full-screen-mode">
+ <div class="row">
+ <div class="col d-flex justify-content-start">
+ <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
</div>
+ <div class="col d-none d-md-flex justify-content-end">
+ <div id="LiveViewSwitcher" class="btn-group btn-group-toggle" data-toggle="buttons">
+ <label class="btn btn-outline-primary active">
+ <input type="radio" name="options" id="mobileLiveView" autocomplete="off"> Mobile
+ </label>
+ <label class="btn btn-outline-primary">
+ <input type="radio" name="options" id="tabletLiveView" autocomplete="off"> Tablet
+ </label>
+ <label class="btn btn-outline-primary">
+ <input type="radio" name="options" id="desktopLiveView" autocomplete="off" checked> Desktop
+ </label>
+ </div>
- <div class="ml-2">
- <button id="cmsSectionEditorFullScreen" type="button" class="btn btn-outline-primary no-wrap" data-toggle="button" autocomplete="off"><%= raw Spree.t('admin.cms.full_screen_mode') %></button>
+ <div class="ml-2">
+ <button id="cmsSectionEditorFullScreen" type="button" class="btn btn-outline-primary no-wrap" data-toggle="button" autocomplete="off"><%= raw Spree.t('admin.cms.full_screen_mode') %></button>
+ </div>
</div>
</div>
- </div>
- <div class="row no-gutters">
- <div class="col-12 col-md-4 bg-light border border-right-0">
- <% if @cms_page.cms_sections.any? %>
- <div id="cmsPagesectionsArea" class="card-body row m-0 p-0 no-gutters">
- <% @cms_page.cms_sections.each do |section| %>
- <%= build_page_section(section) %>
- <% end %>
- </div>
+ <div class="row no-gutters">
+ <div class="col-12 col-md-4 bg-light border border-right-0">
+ <% if @cms_page.cms_sections.any? %>
+ <div id="cmsPagesectionsArea" class="card-body row m-0 p-0 no-gutters">
+ <% @cms_page.cms_sections.each do |section| %>
+ <%= build_page_section(section) %>
+ <% end %>
+ </div>
- <% else %>
- <div class="row">
- <div class="col-12">
- <div class="alert alert-info no-objects-found m-4">
- <%= Spree.t('admin.cms.no_sections_found_please_add_one') %>
+ <% else %>
+ <div class="row">
+ <div class="col-12">
+ <div class="alert alert-info no-objects-found m-4">
+ <%= Spree.t('admin.cms.no_sections_found_please_add_one') %>
+ </div>
</div>
</div>
- </div>
- <% end %>
- </div>
+ <% end %>
+ </div>
- <div class="d-none d-md-block col-8 bg-secondary border">
- <div id="liveViewCont" class="desktopLiveView">
- <div class="embed-responsive embed-responsive-4by3">
- <iframe class="embed-responsive-item"
- id="pageLivePreview"
- src="<%= preview_url(@cms_page) %>"
- sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">
- </iframe>
+ <div class="d-none d-md-block col-8 bg-secondary border">
+ <div id="liveViewCont" class="desktopLiveView">
+ <div class="embed-responsive embed-responsive-4by3">
+ <iframe class="embed-responsive-item"
+ id="pageLivePreview"
+ src="<%= preview_url(@cms_page) %>"
+ sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">
+ </iframe>
+ </div>
</div>
</div>
- </div>
+ </div>
</div>
</div>
-</div>
<% end %>
diff --git a/core/app/models/spree/cms/pages/feature_page.rb b/core/app/models/spree/cms/pages/feature_page.rb
index d170dbd65c..4543c5ae06 100644
--- a/core/app/models/spree/cms/pages/feature_page.rb
+++ b/core/app/models/spree/cms/pages/feature_page.rb
@@ -1,7 +1,5 @@
module Spree::Cms::Pages
class FeaturePage < Spree::CmsPage
- validates :slug, uniqueness: true
-
def sections?
true
end
diff --git a/core/app/models/spree/cms/pages/standard_page.rb b/core/app/models/spree/cms/pages/standard_page.rb
index c26ec444cf..d0f5b94053 100644
--- a/core/app/models/spree/cms/pages/standard_page.rb
+++ b/core/app/models/spree/cms/pages/standard_page.rb
@@ -1,9 +1,4 @@
module Spree::Cms::Pages
class StandardPage < Spree::CmsPage
- validates :slug, uniqueness: true
-
- def sections?
- false
- end
end
end
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index 293be727f8..43cef780e4 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -17,6 +17,7 @@ module Spree
before_validation :handle_slug
validates :title, presence: true
+ validates :slug, uniqueness: { allow_nil: true, case_sensitive: true }
scope :visible, -> { where(visible: true) }
scope :by_store, ->(store) { where(store: store) }
@@ -53,15 +54,13 @@ module Spree
private
def handle_slug
- if homepage?
- self.slug = nil
- else
- self.slug = if slug.blank?
- title.to_url
- else
- slug.to_url
- end
- end
+ self.slug = if homepage?
+ nil
+ elsif slug.blank?
+ title&.downcase&.to_url
+ else
+ slug&.downcase&.to_url
+ end
end
end
end