Browse Source

ensure to be able to get layoutType config value from local_config

Yuki Takei 9 years ago
parent
commit
78799e6258
2 changed files with 8 additions and 2 deletions
  1. 6 0
      lib/models/config.js
  2. 2 2
      lib/util/swigFunctions.js

+ 6 - 0
lib/models/config.js

@@ -254,6 +254,11 @@ module.exports = function(crowi) {
     return this.uglifiedCustomCss;
     return this.uglifiedCustomCss;
   }
   }
 
 
+  configSchema.statics.layoutType = function(config)
+  {
+    return config.crowi['customize:layout'] || 'crowi';
+  }
+
   configSchema.statics.fileUploadEnabled = function(config)
   configSchema.statics.fileUploadEnabled = function(config)
   {
   {
     const Config = this;
     const Config = this;
@@ -304,6 +309,7 @@ module.exports = function(crowi) {
         image: Config.isUploadable(config),
         image: Config.isUploadable(config),
         file: Config.fileUploadEnabled(config),
         file: Config.fileUploadEnabled(config),
       },
       },
+      layoutType: Config.layoutType(config),
     };
     };
 
 
     return local_config;
     return local_config;

+ 2 - 2
lib/util/swigFunctions.js

@@ -56,8 +56,8 @@ module.exports = function(crowi, app, req, locals) {
   }
   }
 
 
   locals.layoutType = function() {
   locals.layoutType = function() {
-    var config = crowi.getConfig();
-    return config.crowi['customize:layout'] || 'crowi';
+    var config = crowi.getConfig()
+    return Config.layoutType(config);
   }
   }
 
 
   locals.slackConfigured = function() {
   locals.slackConfigured = function() {