Просмотр исходного кода

WIP: refactor page route

add addRendarVarsForScope method
Yuki Takei 7 лет назад
Родитель
Сommit
2c7be98dcd
2 измененных файлов с 10 добавлено и 3 удалено
  1. 7 0
      src/server/routes/page.js
  2. 3 3
      src/server/views/_form.html

+ 7 - 0
src/server/routes/page.js

@@ -124,6 +124,12 @@ module.exports = function(crowi, app) {
     }
     }
   }
   }
 
 
+  function addRendarVarsForScope(renderVars, page) {
+    renderVars.grant = page.grant;
+    renderVars.grantedGroupId = page.grantedGroup ? page.grantedGroup.id : null;
+    renderVars.grantedGroupName = page.grantedGroup ? page.grantedGroup.name : null;
+  }
+
   async function addRenderVarsForSlack(renderVars, page) {
   async function addRenderVarsForSlack(renderVars, page) {
     renderVars.slack = await getSlackChannels(page);
     renderVars.slack = await getSlackChannels(page);
   }
   }
@@ -241,6 +247,7 @@ module.exports = function(crowi, app) {
     // populate
     // populate
     page = await page.populateDataToShowRevision();
     page = await page.populateDataToShowRevision();
     addRendarVarsForPage(renderVars, page);
     addRendarVarsForPage(renderVars, page);
+    addRendarVarsForScope(renderVars, page);
 
 
     await addRenderVarsForSlack(renderVars, page);
     await addRenderVarsForSlack(renderVars, page);
     await addRenderVarsForDescendants(renderVars, path, req.user, offset, limit);
     await addRenderVarsForDescendants(renderVars, path, req.user, offset, limit);

+ 3 - 3
src/server/views/_form.html

@@ -16,9 +16,9 @@
   </div>
   </div>
 
 
   <div id="save-page-controls"
   <div id="save-page-controls"
-    data-grant="{{ page.grant }}"
-    data-grant-group="{{ page.grantedGroup._id.toString() }}"
-    data-grant-group-name="{{ page.grantedGroup.name }}">
+    data-grant="{{ grant }}"
+    data-grant-group="{{ grantedGroupId }}"
+    data-grant-group-name="{{ grantedGroupName }}">
   </div>
   </div>
 
 
 </div>
 </div>