|
@@ -342,11 +342,15 @@ module.exports = function(crowi, app) {
|
|
|
.then(function() {
|
|
.then(function() {
|
|
|
return UserGroupRelation.findAllRelationForUser(req.user);
|
|
return UserGroupRelation.findAllRelationForUser(req.user);
|
|
|
}).then(function (groupRelations) {
|
|
}).then(function (groupRelations) {
|
|
|
- renderVars.userRelatedGroups = groupRelations.map(relation => relation.relatedGroup);
|
|
|
|
|
|
|
+ if (groupRelations != null) {
|
|
|
|
|
+ renderVars.userRelatedGroups = groupRelations.map(relation => relation.relatedGroup);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return PageGroupRelation.findByPage(renderVars.page);
|
|
return PageGroupRelation.findByPage(renderVars.page);
|
|
|
}).then((pageGroupRelation) => {
|
|
}).then((pageGroupRelation) => {
|
|
|
- renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
|
|
|
|
|
|
|
+ if (pageGroupRelation != null) {
|
|
|
|
|
+ renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return Promise.resolve();
|
|
return Promise.resolve();
|
|
|
});
|
|
});
|