Merge branch 'master' of github.com:noesya/osuny into feature/block-timeline

app/controllers/admin/communication/website/categories_controller.rb

@@ -19,8 +19,12 @@ class Admin::Communication::Website::CategoriesController < Admin::Communication
         parent_id: parent_id,
         position: index + 1
       )
+      category.sync_with_git unless parent_id
+    end
+    if parent_id
+      parent = @website.categories.find(parent_id)
+      parent.sync_with_git
     end
-    first_category.sync_with_git if first_category
   end
 
   def children

app/models/communication/website/page.rb

@@ -124,13 +124,13 @@ class Communication::Website::Page < ApplicationRecord
 
   def best_featured_image
     # we don't want to fallback on homepage featured_image
-    return featured_image if featured_image.attached? || parent.kind_home?
+    return featured_image if featured_image.attached? || kind_home? || parent.kind_home?
     parent&.best_featured_image
   end
 
   def best_bodyclass
     return bodyclass if bodyclass.present?
-    parent&.best_bodyclass unless parent.kind_home?
+    parent&.best_bodyclass unless kind_home? || parent.kind_home?
   end
 
   def update_children_paths

app/views/admin/communication/website/menu/items/_form.html.erb

 <%= simple_form_for item, url: item.persisted?  ? [:admin, item, { menu_id: @menu.id }]
                                                 : admin_communication_website_menu_items_path(@menu) do |f| %>
+  <%= f.input :parent_id, as: :hidden, wrapper: false %>
   <div class="card flex-fill w-100">
     <div class="card-header">
       <h5 class="card-title mb-0"><%= t('content') %></h5>