Răsfoiți Sursa

remove Page.isCreator method

Yuki Takei 7 ani în urmă
părinte
comite
379c8667c2
2 a modificat fișierele cu 2 adăugiri și 46 ștergeri
  1. 2 18
      src/server/models/page.js
  2. 0 28
      src/test/models/page.test.js

+ 2 - 18
src/server/models/page.js

@@ -125,28 +125,12 @@ module.exports = function(crowi) {
     return templateChecker(this.path);
   };
 
-  pageSchema.methods.isCreator = function(userData) {
-    // ゲスト閲覧の場合は userData に false が入る
-    if (!userData) {
-      return false;
-    }
-
-    if (this.populated('creator') && this.creator._id.toString() === userData._id.toString()) {
-      return true;
-    }
-    else if (this.creator.toString() === userData._id.toString()) {
-      return true;
-    }
-
-    return false;
-  };
-
   pageSchema.methods.isGrantedFor = function(userData) {
-    if (this.isPublic() || this.isCreator(userData)) {
+    if (this.isPublic()) {
       return true;
     }
 
-    if (this.grantedUsers.indexOf(userData._id) >= 0) {
+    if (userData != null && this.grantedUsers.indexOf(userData._id) >= 0) {
       return true;
     }
 

+ 0 - 28
src/test/models/page.test.js

@@ -229,34 +229,6 @@ describe('Page', () => {
     });
   });
 
-  describe('.isCreator', () => {
-    context('with creator', () => {
-      it('should return true', done => {
-        User.findOne({email: 'anonymous0@example.com'}, (err, user) => {
-          if (err) { done(err); }
-
-          Page.findOne({path: '/user/anonymous0/memo'}, (err, page) => {
-            expect(page.isCreator(user)).to.be.equal(true);
-            done();
-          })
-        });
-      });
-    });
-
-    context('with non-creator', () => {
-      it('should return false', done => {
-        User.findOne({email: 'anonymous1@example.com'}, (err, user) => {
-          if (err) { done(err); }
-
-          Page.findOne({path: '/user/anonymous0/memo'}, (err, page) => {
-            expect(page.isCreator(user)).to.be.equal(false);
-            done();
-          })
-        });
-      });
-    });
-  });
-
   describe('.isGrantedFor', () => {
     context('with a granted user', () => {
       it('should return true', done => {