Преглед изворни кода

Merge branch 'master' into feat/gw7907-compare-page-versions-on-history-tab

Ryoji Shimizu пре 3 година
родитељ
комит
e81228f5c8
1 измењених фајлова са 4 додато и 1 уклоњено
  1. 4 1
      packages/app/src/server/routes/attachment.js

+ 4 - 1
packages/app/src/server/routes/attachment.js

@@ -468,7 +468,10 @@ module.exports = function(crowi, app) {
     if (pageId == null) {
     if (pageId == null) {
       logger.debug('Create page before file upload');
       logger.debug('Create page before file upload');
 
 
-      page = await crowi.pageService.create(pagePath, `# ${pagePath}`, req.user, { grant: Page.GRANT_OWNER });
+      const isAclEnabled = crowi.aclService.isAclEnabled();
+      const grant = isAclEnabled ? Page.GRANT_OWNER : Page.GRANT_PUBLIC;
+
+      page = await crowi.pageService.create(pagePath, `# ${pagePath}`, req.user, { grant });
       pageCreated = true;
       pageCreated = true;
       pageId = page._id;
       pageId = page._id;
     }
     }