mirror of
https://github.com/Dvorinka/MyClubServer.git
synced 2026-06-04 02:32:57 +00:00
dev day #79
This commit is contained in:
@@ -110,7 +110,7 @@ func (ctrl *MyUIbrixController) OptimizePageLayout(c *gin.Context) {
|
||||
var configs []map[string]interface{}
|
||||
|
||||
query := `
|
||||
SELECT element_name, variant, visible, display_order, custom_styles
|
||||
SELECT element_name, variant, visible, display_order, settings
|
||||
FROM page_element_configs
|
||||
WHERE page_type = ?
|
||||
ORDER BY display_order ASC
|
||||
@@ -127,22 +127,33 @@ func (ctrl *MyUIbrixController) OptimizePageLayout(c *gin.Context) {
|
||||
var elementName, variant string
|
||||
var visible bool
|
||||
var displayOrder int
|
||||
var customStylesJSON []byte
|
||||
var settingsJSON []byte
|
||||
|
||||
if err := rows.Scan(&elementName, &variant, &visible, &displayOrder, &customStylesJSON); err != nil {
|
||||
if err := rows.Scan(&elementName, &variant, &visible, &displayOrder, &settingsJSON); err != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
// settings is a JSON object; we expect optional nested key "styles"
|
||||
var settings map[string]interface{}
|
||||
if len(settingsJSON) > 0 {
|
||||
_ = json.Unmarshal(settingsJSON, &settings)
|
||||
}
|
||||
|
||||
var customStyles map[string]interface{}
|
||||
if len(customStylesJSON) > 0 {
|
||||
json.Unmarshal(customStylesJSON, &customStyles)
|
||||
if settings != nil {
|
||||
if st, ok := settings["styles"]; ok {
|
||||
if m, ok2 := st.(map[string]interface{}); ok2 {
|
||||
customStyles = m
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
configs = append(configs, map[string]interface{}{
|
||||
"element_name": elementName,
|
||||
"variant": variant,
|
||||
"visible": visible,
|
||||
"variant": variant,
|
||||
"visible": visible,
|
||||
"display_order": displayOrder,
|
||||
// Keep API field name as custom_styles for compatibility
|
||||
"custom_styles": customStyles,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user