Browse Source

Fixed null pointer exception is occured when user created a new page.

Tatsuya Ise 8 years ago
parent
commit
210681eae2
2 changed files with 9 additions and 2 deletions
  1. 3 0
      lib/models/page-group-relation.js
  2. 6 2
      lib/routes/page.js

+ 3 - 0
lib/models/page-group-relation.js

@@ -143,6 +143,9 @@ class PageGroupRelation {
    */
   static findByPage(page) {
 
+    if (page == null) {
+      return null;
+    }
     return this
       .find({ targetPage: page.id })
       .populate('relatedGroup')

+ 6 - 2
lib/routes/page.js

@@ -342,11 +342,15 @@ module.exports = function(crowi, app) {
     .then(function() {
       return UserGroupRelation.findAllRelationForUser(req.user);
     }).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);
     }).then((pageGroupRelation) => {
-      renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
+      if (pageGroupRelation != null) {
+        renderVars.pageRelatedGroup = pageGroupRelation.relatedGroup;
+      }
 
       return Promise.resolve();
     });