itizawa hace 5 años
padre
commit
4ec00d1bb6

+ 2 - 2
src/client/js/components/Page/TrashPageAlert.jsx

@@ -12,7 +12,7 @@ import UserPicture from '../User/UserPicture';
 const TrashPageAlert = (props) => {
   const { t, appContainer, pageContainer } = props;
   const {
-    path, isDeleted, revisionAuthor, updatedAt, childrenPages, isAbleToDeleteCompletely,
+    path, isDeleted, revisionAuthor, updatedAt, hasChildren, isAbleToDeleteCompletely,
   } = pageContainer.state;
   const { currentUser } = appContainer;
 
@@ -54,7 +54,7 @@ const TrashPageAlert = (props) => {
       This page is in the trash <i className="icon-trash" aria-hidden="true"></i>.
         {isDeleted && <span><br /><UserPicture user={revisionAuthor} /> Deleted by {revisionAuthor.name} at {updatedAt}</span>}
       </div>
-      {(currentUser.admin && path === '/trash' && childrenPages.length > 0) && renderEmptyButton()}
+      {(currentUser.admin && path === '/trash' && hasChildren) && renderEmptyButton()}
       {(isDeleted && currentUser != null) && renderTrashPageManagementButtons()}
     </div>
   );

+ 1 - 1
src/client/js/services/PageContainer.js

@@ -50,7 +50,7 @@ export default class PageContainer extends Container {
       isDeleted:  JSON.parse(mainContent.getAttribute('data-page-is-deleted')),
       isAbleToDeleteCompletely:  JSON.parse(mainContent.getAttribute('data-page-is-able-to-delete-completely')),
       tags: [],
-      childrenPages: JSON.parse(mainContent.getAttribute('data-children-pages')),
+      hasChildren: JSON.parse(mainContent.getAttribute('data-page-has-children')),
       templateTagData: mainContent.getAttribute('data-template-tags') || null,
 
       // latest(on remote) information

+ 2 - 2
src/server/views/widget/page_content.html

@@ -17,7 +17,7 @@
   data-page-created-at="{% if page %}{{ page.createdAt|datetz('Y/m/d H:i:s') }}{% endif %}"
   data-page-creator="{% if page %}{{ page.creator|json }}{% endif %}"
   data-page-updated-at="{% if page %}{{ page.updatedAt|datetz('Y/m/d H:i:s') }}{% endif %}"
-  data-children-pages="{{ pages|json }}"
+  data-page-has-children="{% if pages.length > 0 %}true{% else %}false{% endif %}"
   >
 {% else %}
 <div id="content-main" class="content-main"
@@ -25,7 +25,7 @@
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-slack-channels="{{ slack|default('') }}"
   data-page-is-deleted="{% if page.isDeleted() %}true{% else %}false{% endif %}"
-  data-children-pages="{{ pages|json }}"
+  data-page-has-children="{% if pages.length > 0 %}true{% else %}false{% endif %}"
   >
 {% endif %}