kaho-y 4 лет назад
Родитель
Сommit
f46af7419c
2 измененных файлов с 1 добавлено и 17 удалено
  1. 0 9
      src/client/js/components/Sidebar/RecentChanges.jsx
  2. 1 8
      src/server/models/page.js

+ 0 - 9
src/client/js/components/Sidebar/RecentChanges.jsx

@@ -63,14 +63,6 @@ class RecentChanges extends React.Component {
       locked = <span><i className="icon-lock" /></span>;
     }
 
-    const tags = page.tags;
-    const tagElements = tags.map((tag) => {
-      return (
-        <a key={tag} href={`/_search?q=tag:${tag.name}`} className="grw-tag-label badge badge-secondary mr-2">
-          {tag.name}
-        </a>
-      );
-    });
 
     return (
       <li className="list-group-item p-2">
@@ -87,7 +79,6 @@ class RecentChanges extends React.Component {
               <span className="seen-user-count">{page.seenUsers.length}</span>
               <i className="icon-bubble"></i>
               <span>{page.commentCount}</span>
-              { tagElements }
               <br />
               <FormattedDistanceDate id={page.id} date={page.updatedAt} />
             </div>

+ 1 - 8
src/server/models/page.js

@@ -767,14 +767,7 @@ module.exports = function(crowi) {
     // find
     builder.addConditionToPagenate(opt.offset, opt.limit, sortOpt);
     builder.populateDataToList(User.USER_FIELDS_EXCEPT_CONFIDENTIAL);
-    const pages = await builder.query.lean().exec('find');
-    const PageTagRelation = mongoose.model('PageTagRelation');
-    await Promise.all(pages.map(async(page) => {
-      const relations = await PageTagRelation.find({ relatedPage: page._id }).populate('relatedTag');
-      page.tags = relations.map((relation) => {
-        return relation.relatedTag;
-      });
-    }));
+    const pages = await builder.query.exec('find');
 
     const result = {
       pages, totalCount, offset: opt.offset, limit: opt.limit,