mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-04 22:38:43 +00:00
Merge pull request #5141 from naturalcrit/Cleanup_homebrew.api
Small cleanup of migrateSystemsToTags
This commit is contained in:
+4
-17
@@ -27,17 +27,8 @@ const isStaticTheme = (renderer, themeName)=>{
|
|||||||
return Themes[renderer]?.[themeName] !== undefined;
|
return Themes[renderer]?.[themeName] !== undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
// const getTopBrews = (cb) => {
|
|
||||||
// HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
|
|
||||||
// cb(brews);
|
|
||||||
// });
|
|
||||||
// };
|
|
||||||
|
|
||||||
|
|
||||||
const migrateSystemsToTags = (brew)=>{
|
const migrateSystemsToTags = (brew)=>{
|
||||||
if(!('systems' in brew)) return brew;
|
if(!('systems' in brew) || !Array.isArray(brew.systems) || brew.systems.length === 0) {
|
||||||
|
|
||||||
if(!Array.isArray(brew.systems) || brew.systems.length === 0) {
|
|
||||||
brew.systems = undefined;
|
brew.systems = undefined;
|
||||||
return brew;
|
return brew;
|
||||||
}
|
}
|
||||||
@@ -189,10 +180,7 @@ const api = {
|
|||||||
stub.renderer = stub.renderer || undefined; // Clear empty strings
|
stub.renderer = stub.renderer || undefined; // Clear empty strings
|
||||||
stub = _.defaults(stub, DEFAULT_BREW_LOAD); // Fill in blank fields
|
stub = _.defaults(stub, DEFAULT_BREW_LOAD); // Fill in blank fields
|
||||||
|
|
||||||
|
req.brew = migrateSystemsToTags(stub);
|
||||||
|
|
||||||
const fixedStub = migrateSystemsToTags(stub);
|
|
||||||
req.brew = fixedStub;
|
|
||||||
splitTextStyleAndMetadata(req.brew);
|
splitTextStyleAndMetadata(req.brew);
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
@@ -412,10 +400,9 @@ const api = {
|
|||||||
// throw err; // rethrow to preserve the 500 behavior
|
// throw err; // rethrow to preserve the 500 behavior
|
||||||
}
|
}
|
||||||
|
|
||||||
let brew = _.assign(brewFromServer, brewFromClient);
|
let brew = _.assign(brewFromServer, brewFromClient);
|
||||||
|
|
||||||
migrateSystemsToTags(brew);
|
|
||||||
|
|
||||||
|
brew = migrateSystemsToTags(brew);
|
||||||
brew.title = brew.title.trim();
|
brew.title = brew.title.trim();
|
||||||
brew.description = brew.description.trim() || '';
|
brew.description = brew.description.trim() || '';
|
||||||
brew.text = api.mergeBrewText(brew);
|
brew.text = api.mergeBrewText(brew);
|
||||||
|
|||||||
Reference in New Issue
Block a user