TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 20:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Fixed relative image paths for settings v2 admin api

Browse Source 
refs #10363
This commit is contained in:
kirrg001 2019-01-14 21:01:12 +01:00
parent 56db4ddd75
commit 95b5fb1c81
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/server/api/v2/utils/serializers/output/settings.js
View File

@ -26,6 +26,7 @@ _private.settingsFilter = (settings, filter) => {
module.exports = { module.exports = {
browse(models, apiConfig, frame) { browse(models, apiConfig, frame) {
let filteredSettings; let filteredSettings;
// If this is public, we already have the right data, we just need to add an Array wrapper // If this is public, we already have the right data, we just need to add an Array wrapper
if (utils.isContentAPI(frame)) { if (utils.isContentAPI(frame)) {
filteredSettings = models; filteredSettings = models;

27
core/server/api/v2/utils/serializers/output/utils/url.js
View File

@ -1,3 +1,4 @@
const _ = require('lodash');
const urlService = require('../../../../../../services/url'); const urlService = require('../../../../../../services/url');
const forPost = (id, attrs, options) => { const forPost = (id, attrs, options) => {
@ -64,16 +65,26 @@ const forTag = (id, attrs) => {
}; };
const forSettings = (attrs) => { const forSettings = (attrs) => {
if (attrs.cover_image) { // @TODO: https://github.com/TryGhost/Ghost/issues/10106
attrs.cover_image = urlService.utils.urlFor('image', {image: attrs.cover_image}, true); // @NOTE: Admin & Content API return a different format, need to mappers
} if (_.isArray(attrs)) {
attrs.forEach((obj) => {
if (['cover_image', 'logo', 'icon'].includes(obj.key) && obj.value) {
obj.value = urlService.utils.urlFor('image', {image: obj.value}, true);
}
});
} else {
if (attrs.cover_image) {
attrs.cover_image = urlService.utils.urlFor('image', {image: attrs.cover_image}, true);
}
if (attrs.logo) { if (attrs.logo) {
attrs.logo = urlService.utils.urlFor('image', {image: attrs.logo}, true); attrs.logo = urlService.utils.urlFor('image', {image: attrs.logo}, true);
} }
if (attrs.icon) { if (attrs.icon) {
attrs.icon = urlService.utils.urlFor('image', {image: attrs.icon}, true); attrs.icon = urlService.utils.urlFor('image', {image: attrs.icon}, true);
}
} }
return attrs; return attrs;