fix: show product in replacement of sub products in homepage

apps/pages/admin.py

@@ -46,13 +46,13 @@ class HeroSectionAdmin(admin.ModelAdmin):
 class HomepageSectionItemInline(admin.TabularInline):
     model = HomepageSectionItem
     extra = 1
-    fields = ("icon", "title", "content", "image", "order")
+    fields = ("icon", "title", "content", "url", "image", "order")
     ordering = ("order",)
 
 
 @admin.register(HomepageSection)
 class HomepageSectionAdmin(admin.ModelAdmin):
-    list_display = ("section_type", "badge", "title", "order", "is_active")
+    list_display = ("section_type", "title", "badge", "order", "is_active")
     list_filter = ("section_type", "is_active")
     list_editable = ("order", "is_active")
     inlines = [HomepageSectionItemInline]
@@ -147,22 +147,33 @@ class CustomPageSectionInline(admin.StackedInline):
     show_change_link = True
 
 
-@admin.register(CustomPage)
-class CustomPageAdmin(admin.ModelAdmin):
-    list_display = ("title", "slug", "show_in_nav", "menu_order", "is_published", "updated_at")
-    list_filter = ("show_in_nav", "is_published")
-    search_fields = ("title", "slug", "menu_label")
-    list_editable = ("show_in_nav", "menu_order", "is_published")
-    prepopulated_fields = {"slug": ("title",)}
-    inlines = [CustomPageSectionInline]
-    fieldsets = (
-        (None, {"fields": ("title", "slug", "menu_label", "meta_description")}),
-        ("Navigation", {"fields": ("show_in_nav", "menu_order")}),
-        ("Publishing", {"fields": ("is_published",)}),
+class CustomPageSectionItemOnPageInline(admin.TabularInline):
+    model = CustomPageSectionItem
+    fk_name = "page"
+    extra = 1
+    verbose_name = "Section item"
+    verbose_name_plural = "Section items (subsections)"
+    fields = (
+        "section",
+        "icon",
+        "badge",
+        "title",
+        "content_format",
+        "content",
+        "url",
+        "image",
+        "order",
     )
+    ordering = ("section", "order")
+
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "section":
+            page_id = request.resolver_match.kwargs.get("object_id") if request.resolver_match else None
+            if page_id:
+                kwargs["queryset"] = CustomPageSection.objects.filter(page_id=page_id).order_by("order")
+        return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
 
-@admin.register(CustomPageSection)
 class CustomPageSectionAdmin(admin.ModelAdmin):
     list_display = ("page", "section_type", "title", "order", "is_active")
     list_filter = ("section_type", "is_active", "page")
@@ -175,6 +186,44 @@ class CustomPageSectionAdmin(admin.ModelAdmin):
         ("Settings", {"fields": ("order", "is_active")}),
     )
 
+    def save_formset(self, request, form, formset, change):
+        instances = formset.save(commit=False)
+        for instance in instances:
+            if isinstance(instance, CustomPageSectionItem):
+                instance.page = form.instance.page
+            instance.save()
+        for obj in formset.deleted_objects:
+            obj.delete()
+        formset.save_m2m()
+
+
+@admin.register(CustomPage)
+class CustomPageAdmin(admin.ModelAdmin):
+    list_display = ("title", "slug", "show_in_nav", "menu_order", "is_published", "updated_at")
+    list_filter = ("show_in_nav", "is_published")
+    search_fields = ("title", "slug", "menu_label")
+    list_editable = ("show_in_nav", "menu_order", "is_published")
+    prepopulated_fields = {"slug": ("title",)}
+    inlines = [CustomPageSectionInline, CustomPageSectionItemOnPageInline]
+    fieldsets = (
+        (None, {"fields": ("title", "slug", "menu_label", "meta_description")}),
+        ("Navigation", {"fields": ("show_in_nav", "menu_order")}),
+        ("Publishing", {"fields": ("is_published",)}),
+    )
+
+    def save_formset(self, request, form, formset, change):
+        instances = formset.save(commit=False)
+        for instance in instances:
+            if isinstance(instance, CustomPageSectionItem):
+                instance.page = form.instance
+            instance.save()
+        for obj in formset.deleted_objects:
+            obj.delete()
+        formset.save_m2m()
+
+
+admin.site.register(CustomPageSection, CustomPageSectionAdmin)
+
 
 @admin.register(DownloadItem)
 class DownloadItemAdmin(admin.ModelAdmin):