minhnhat/cms.uldp.edu.vn
1
0
Fork 0
forked from UKSOURCE/cms.hailearning.edu.vn
Code Pull Requests Activity

Merge remote-tracking branch 'origin/fea/nhat-06042026-menu-management' into fea/dat-11042026-merge-code-fix

Browse Source
This commit is contained in:
Tống Thành Đạt
2026-04-11 14:38:20 +07:00
parent e83f1827b8 0109b08b58
commit 0bdabdcbf7
20 changed files with 417 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/homeController.js
View File

@@ -445,14 +445,11 @@ exports.apiGetBlogs = async (req, res) => {
};
exports.api = async (req, res) => {
try {
const docs = await getAllHomeDocs();
let data = docs[0]?.toObject() || {};
// Chỉ dùng doc mới nhất, không merge nhiều docs
const doc = await getHomeDoc();
let data = doc?.toObject() || {};
const baseUrl = `${req.protocol}://${req.get("host")}`;
if (docs.length > 1) {
data.hero = getPreferredHeroData(docs.map((doc) => doc.toObject()));
}
// === Xử lý Blog Preview động ===
const blogPreview = data.blogPreview || {};
let blogs = [];

6
controllers/serviceController.js
View File

@@ -1,5 +1,6 @@
const { getServiceData } = require("../services/service.service");
const Service = require("../models/service");
const syncServiceMenu = require("../services/syncServiceMenu");
const { addBaseUrlToImages, getFullImageUrl } = require("../utils/imageHelper");
const writeAuditLog = require("../audit/writeAuditLog");
const diffObject = require("../audit/diffObject");
@@ -98,6 +99,8 @@ exports.updateService = async (req, res) => {
changes,
req,
});
// Sync header menu children to reflect updated service name/slug
await syncServiceMenu(updatedData.services?.items || []);
req.flash("success_msg", "Service updated successfully");
res.redirect("/admin/service");
} catch (err) {
@@ -168,6 +171,9 @@ exports.update = async (req, res) => {
await Service.create(updatedData);
}
// Sync header menu children to reflect current service list
await syncServiceMenu(updatedData.services?.items || []);
req.flash("success_msg", "Service updated successfully");
res.redirect("/admin/service");
} catch (err) {