Merge branch 'master' of github.com:noesya/osuny

app/assets/stylesheets/admin/styles.sass

@@ -6,6 +6,9 @@ h1
 
 .sidebar
     background: black
+    footer
+        a
+            padding: 0.625rem 1.625rem
 .sidebar-content
     background-color: black
     background-image: asset-url('sun.svg')

app/models/communication/website/page.rb

@@ -57,8 +57,9 @@ class Communication::Website::Page < ApplicationRecord
              dependent: :nullify
 
   validates :title, presence: true
+  validate :homepage_is_published?
 
-  before_save :make_path
+  before_validation :make_path
   after_save :update_children_paths if :saved_change_to_path?
 
   scope :ordered, -> { order(:position) }
@@ -93,4 +94,10 @@ class Communication::Website::Page < ApplicationRecord
   def update_children_paths
     children.each(&:save)
   end
+
+  def homepage_is_published?
+     if path == '/' and !published
+        errors.add(:published, :home_not_published)
+     end
+  end
 end

app/models/concerns/with_slug.rb

@@ -2,7 +2,7 @@ module WithSlug
   extend ActiveSupport::Concern
 
   included do
-    before_validation :generate_slug, if: Proc.new { |o| o.slug.blank? }
+    before_validation :generate_slug, if: Proc.new { |o| o.slug.nil? }
   end
 
   protected

config/locales/communication/en.yml

@@ -106,6 +106,12 @@ en:
         text: Text
         title: Title
         website: Website
+    errors:
+      models:
+        communication/website/page:
+          attributes:
+            published:
+              home_not_published: must be checked. Homepage has to be published.
   enums:
     communication/website/menu/item:
       kind:

config/locales/communication/fr.yml

@@ -106,6 +106,12 @@ fr:
         text: Texte
         title: Titre
         website: Site Web
+    errors:
+      models:
+        communication/website/page:
+          attributes:
+            published:
+              home_not_published: doit être coché. La page d'accueil doit être publiée.
   enums:
     communication/website/menu/item:
       kind: