liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: trim and auto-remove trailing slash for Site URL in Admin General

Browse Source
This commit is contained in:
NGPixel 2020-04-24 00:17:10 -04:00
parent 7c59bfed08
commit ec2d10c7f2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/admin/admin-auth.vue
View File

@ -204,7 +204,7 @@
inset inset
) )
v-card.mt-4.wiki-form.animated.fadeInUp.wait-p4s v-card.mt-4.wiki-form.animated.fadeInUp.wait-p4s(v-if='selectedStrategy !== `local`')
v-toolbar(color='primary', dense, flat, dark) v-toolbar(color='primary', dense, flat, dark)
.subtitle-1 {{$t('admin:auth.configReference')}} .subtitle-1 {{$t('admin:auth.configReference')}}
v-card-text v-card-text

13
server/graph/resolvers/site.js
View File

@ -1,4 +1,5 @@
const graphHelper = require('../../helpers/graph') const graphHelper = require('../../helpers/graph')
const _ = require('lodash')
/* global WIKI */ /* global WIKI */
@ -25,10 +26,14 @@ module.exports = {
}, },
SiteMutation: { SiteMutation: {
async updateConfig(obj, args, context) { async updateConfig(obj, args, context) {
let siteHost = _.trim(args.host)
if (siteHost.endsWith('/')) {
siteHost = siteHost.splice(0, -1)
}
try { try {
WIKI.config.host = args.host WIKI.config.host = siteHost
WIKI.config.title = args.title WIKI.config.title = _.trim(args.title)
WIKI.config.company = args.company WIKI.config.company = _.trim(args.company)
WIKI.config.contentLicense = args.contentLicense WIKI.config.contentLicense = args.contentLicense
WIKI.config.seo = { WIKI.config.seo = {
description: args.description, description: args.description,
@ -36,7 +41,7 @@ module.exports = {
analyticsService: args.analyticsService, analyticsService: args.analyticsService,
analyticsId: args.analyticsId analyticsId: args.analyticsId
} }
WIKI.config.logoUrl = args.logoUrl WIKI.config.logoUrl = _.trim(args.logoUrl)
WIKI.config.features = { WIKI.config.features = {
featurePageRatings: args.featurePageRatings, featurePageRatings: args.featurePageRatings,
featurePageComments: args.featurePageComments, featurePageComments: args.featurePageComments,