Просмотр исходного кода

Merge branch 'feat/brush-up-tag-feature' into feat/add-message-to-tags-page

yusuketk 7 лет назад
Родитель
Сommit
022d15c669

+ 1 - 1
src/client/js/components/Page/TagLabel.jsx

@@ -51,7 +51,7 @@ class TagLabel extends React.Component {
     // eslint-disable-next-line no-restricted-globals
     const isPageEditor = location.href.slice(-5) === '#edit';
 
-    if (isPageEditor) { // set tag on draft on efit
+    if (isPageEditor) { // set tag on draft on edit
       this.props.sendTagData(this.state.newPageTags);
       this.setState({ currentPageTags: this.state.newPageTags, isOpenModal: false });
     }

+ 1 - 2
src/client/js/components/TagsList.jsx

@@ -164,13 +164,12 @@ export default class TagsList extends React.Component {
     paginationItems.push(paginations);
     const nextLastItems = this.generateNextLast(activePage, totalPage);
     paginationItems.push(nextLastItems);
-    const pagenation = this.state.tagData.length ? <Pagination>{paginationItems}</Pagination> : <h3>You have no tag. You can set tags on pages.</h3>;
 
     return (
       <div>
         <ul className="list-group mx-4">{tagList}</ul>
         <div className="text-center">
-          {pagenation}
+          <Pagination>{paginationItems}</Pagination>
         </div>
       </div>
     );