hidePagesRestrictedByOwnerInList, fix configmodel

src/server/models/config.js

@@ -153,7 +153,7 @@ module.exports = function(crowi) {
   }
 
   function getValueForCrowiNS(config, key) {
-    configManager.getConfig('crowi', key);
+    crowi.configManager.getConfig('crowi', key);
     // // return the default value if undefined
     // if (undefined === config.crowi || undefined === config.crowi[key]) {
     //   return getDefaultCrowiConfigs()[key];
@@ -163,7 +163,7 @@ module.exports = function(crowi) {
   }
 
   function getValueForMarkdownNS(config, key) {
-    configManager.getConfig('markdown', key);
+    crowi.configManager.getConfig('markdown', key);
     // // return the default value if undefined
     // if (undefined === config.markdown || undefined === config.markdown[key]) {
     //   return getDefaultMarkdownConfigs()[key];
@@ -349,11 +349,6 @@ module.exports = function(crowi) {
     return SECURITY_RESTRICT_GUEST_MODE_READONLY === restrictGuestMode;
   };
 
-  configSchema.statics.hidePagesRestrictedByOwnerInList = function(config) {
-    const key = 'security:list-policy:hideRestrictedByOwner';
-    return getValueForCrowiNS(config, key);
-  };
-
   configSchema.statics.hidePagesRestrictedByGroupInList = function(config) {
     const key = 'security:list-policy:hideRestrictedByGroup';
     return getValueForCrowiNS(config, key);

src/server/models/page.js

@@ -275,6 +275,8 @@ class PageQueryBuilder {
 }
 
 module.exports = function(crowi) {
+  const { configManager } = crowi;
+
   let pageEvent;
 
   // init event
@@ -811,7 +813,7 @@ module.exports = function(crowi) {
     const config = crowi.getConfig();
 
     // determine User condition
-    const hidePagesRestrictedByOwner = Config.hidePagesRestrictedByOwnerInList(config);
+    const hidePagesRestrictedByOwner = configManager.getCofnig('crowi', 'security:list-policy:hideRestrictedByOwner');
     const hidePagesRestrictedByGroup = Config.hidePagesRestrictedByGroupInList(config);
 
     // determine UserGroup condition

src/server/util/search.js

@@ -19,6 +19,7 @@ function SearchClient(crowi, esUri) {
   this.esUri = esUri;
   this.crowi = crowi;
   this.searchEvent = crowi.event('search');
+  this.configManager = this.crowi.configManager;
 
   // In Elasticsearch RegExp, we don't need to used ^ and $.
   // Ref: https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-regexp-query.html#_standard_operators
@@ -556,7 +557,7 @@ SearchClient.prototype.filterPagesByViewer = async function(query, user, userGro
   const Config = this.crowi.model('Config');
   const config = this.crowi.getConfig();
 
-  const showPagesRestrictedByOwner = !Config.hidePagesRestrictedByOwnerInList(config);
+  const showPagesRestrictedByOwner = !this.configManager.getCofnig('crowi', 'security:list-policy:hideRestrictedByOwner');
   const showPagesRestrictedByGroup = !Config.hidePagesRestrictedByGroupInList(config);
 
   query = this.initializeBoolQuery(query); // eslint-disable-line no-param-reassign