Remove camel case from imageuploadtype in config
This removes the only camel cased option of the config options **we** added to the config.json. In auth provider's config parts are a lot of camel cased options provided. We shouldn't touch them to keep them as similar as possible to the examples. Fixes #315 Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
This commit is contained in:
@@ -13,6 +13,7 @@ const debugConfig = {
|
||||
debug: (env === Environment.development)
|
||||
}
|
||||
|
||||
// Get version string from package.json
|
||||
const {version} = require(path.join(appRootPath, 'package.json'))
|
||||
|
||||
const packageConfig = {
|
||||
@@ -20,7 +21,7 @@ const packageConfig = {
|
||||
minimumCompatibleVersion: '0.5.0'
|
||||
}
|
||||
|
||||
const configFilePath = path.join(__dirname, '../../config.json')
|
||||
const configFilePath = path.join(appRootPath, 'config.json')
|
||||
const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined
|
||||
|
||||
let config = require('./default')
|
||||
@@ -97,8 +98,13 @@ config.isLDAPEnable = config.ldap.url
|
||||
config.isSAMLEnable = config.saml.idpSsoUrl
|
||||
config.isPDFExportEnable = config.allowpdfexport
|
||||
|
||||
// merge legacy values
|
||||
if (config.imageUploadType && !config.imageuploadtype) {
|
||||
config.imageuploadtype = config.imageUploadType
|
||||
}
|
||||
|
||||
// figure out mime types for image uploads
|
||||
switch (config.imageUploadType) {
|
||||
switch (config.imageuploadtype) {
|
||||
case 'imgur':
|
||||
config.allowedUploadMimeTypes = [
|
||||
'image/jpeg',
|
||||
|
||||
Reference in New Issue
Block a user