|
@@ -281,7 +281,6 @@ module.exports = function(crowi, app) {
|
|
|
return Revision.findRevisionList(page.path, {})
|
|
return Revision.findRevisionList(page.path, {})
|
|
|
.then(function(tree) {
|
|
.then(function(tree) {
|
|
|
renderVars.tree = tree;
|
|
renderVars.tree = tree;
|
|
|
- return Promise.resolve();
|
|
|
|
|
})
|
|
})
|
|
|
.then(function() {
|
|
.then(function() {
|
|
|
return Page.checkIfTemplatesExist(originalPath);
|
|
return Page.checkIfTemplatesExist(originalPath);
|
|
@@ -444,25 +443,13 @@ module.exports = function(crowi, app) {
|
|
|
function renderPage(pageData, req, res) {
|
|
function renderPage(pageData, req, res) {
|
|
|
// create page
|
|
// create page
|
|
|
if (!pageData) {
|
|
if (!pageData) {
|
|
|
- var userRelatedGroups
|
|
|
|
|
- UserGroupRelation.findAllRelationForUser(req.user)
|
|
|
|
|
- .then((groupRelations) => {
|
|
|
|
|
- userRelatedGroups = groupRelations.map(relation => relation.relatedGroup);
|
|
|
|
|
- return Promise.resolve();
|
|
|
|
|
- }).then(() => {
|
|
|
|
|
- return Page.findTemplate(getPathFromRequest(req));
|
|
|
|
|
- }).then((template) => {
|
|
|
|
|
- debug('not found page user group resolver : ', userRelatedGroups);
|
|
|
|
|
- return res.render('customlayout-selector/not_found', {
|
|
|
|
|
- author: {},
|
|
|
|
|
- page: false,
|
|
|
|
|
- userRelatedGroups: userRelatedGroups,
|
|
|
|
|
- template: template,
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ Page.findTemplate(getPathFromRequest(req))
|
|
|
|
|
+ .then((template) => {
|
|
|
|
|
+ return res.render('customlayout-selector/not_found', {
|
|
|
|
|
+ author: {},
|
|
|
|
|
+ page: false,
|
|
|
|
|
+ template: template,
|
|
|
});
|
|
});
|
|
|
- return res.render('customlayout-selector/not_found', {
|
|
|
|
|
- author: {},
|
|
|
|
|
- page: false,
|
|
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|