Sfoglia il codice sorgente

Merge pull request #1124 from weseek/fix/lsx

Fix/lsx
Yuki Takei 6 anni fa
parent
commit
d57312dfac

+ 1 - 1
resource/locales/en-US/translation.json

@@ -720,7 +720,7 @@
     "no_pages": "There are no pages the group has view permission",
     "no_pages": "There are no pages the group has view permission",
     "how_to_add1": "Enter a username to add",
     "how_to_add1": "Enter a username to add",
     "how_to_add2": "Select a user from user list",
     "how_to_add2": "Select a user from user list",
-    "remove_from_group": "Remove this group"
+    "remove_from_group": "Remove this user"
   },
   },
 
 
   "importer_management": {
   "importer_management": {

+ 1 - 1
src/server/models/page.js

@@ -809,7 +809,7 @@ module.exports = function(crowi) {
 
 
     // determine User condition
     // determine User condition
     const hidePagesRestrictedByOwner = crowi.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByOwner');
     const hidePagesRestrictedByOwner = crowi.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByOwner');
-    const hidePagesRestrictedByGroup = crowi.configManager.getConfig('crowi', 'security:list-policy:hidePagesRestrictedByGroupInList');
+    const hidePagesRestrictedByGroup = crowi.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByGroup');
 
 
     // determine UserGroup condition
     // determine UserGroup condition
     let userGroups = null;
     let userGroups = null;

+ 1 - 1
src/server/util/search.js

@@ -555,7 +555,7 @@ SearchClient.prototype.appendCriteriaForQueryString = function(query, queryStrin
 
 
 SearchClient.prototype.filterPagesByViewer = async function(query, user, userGroups) {
 SearchClient.prototype.filterPagesByViewer = async function(query, user, userGroups) {
   const showPagesRestrictedByOwner = !this.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByOwner');
   const showPagesRestrictedByOwner = !this.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByOwner');
-  const showPagesRestrictedByGroup = !this.configManager.getConfig('crowi', 'security:list-policy:hidePagesRestrictedByGroupInList');
+  const showPagesRestrictedByGroup = !this.configManager.getConfig('crowi', 'security:list-policy:hideRestrictedByGroup');
 
 
   query = this.initializeBoolQuery(query); // eslint-disable-line no-param-reassign
   query = this.initializeBoolQuery(query); // eslint-disable-line no-param-reassign