Prechádzať zdrojové kódy

convert the type of value of 'app:fileUpload' to boolean

Yuki Takei 8 rokov pred
rodič
commit
56f0090b71
2 zmenil súbory, kde vykonal 4 pridanie a 2 odobranie
  1. 1 1
      lib/form/admin/app.js
  2. 3 1
      lib/models/config.js

+ 1 - 1
lib/form/admin/app.js

@@ -6,6 +6,6 @@ var form = require('express-form')
 module.exports = form(
 module.exports = form(
   field('settingForm[app:title]').required(),
   field('settingForm[app:title]').required(),
   field('settingForm[app:confidential]'),
   field('settingForm[app:confidential]'),
-  field('settingForm[app:fileUpload]').isInt()
+  field('settingForm[app:fileUpload]').trim().toBooleanStrict()
 );
 );
 
 

+ 3 - 1
lib/models/config.js

@@ -28,6 +28,7 @@ module.exports = function(crowi) {
 
 
     // overwrite
     // overwrite
     config['app:title'] = 'crowi-plus';
     config['app:title'] = 'crowi-plus';
+    config['app:fileUpload'] = true;
     config['security:isEnabledPassport'] = true;
     config['security:isEnabledPassport'] = true;
     config['customize:behavior'] = 'crowi-plus';
     config['customize:behavior'] = 'crowi-plus';
     config['customize:layout'] = 'crowi-plus';
     config['customize:layout'] = 'crowi-plus';
@@ -382,7 +383,8 @@ module.exports = function(crowi) {
       return false;
       return false;
     }
     }
 
 
-    return config.crowi['app:fileUpload'] || false;
+    // convert to boolean
+    return !!config.crowi['app:fileUpload'];
   };
   };
 
 
   configSchema.statics.hasSlackConfig = function(config)
   configSchema.statics.hasSlackConfig = function(config)