zahmis 5 лет назад
Родитель
Сommit
b35efb2189

+ 1 - 0
src/client/js/app.jsx

@@ -88,6 +88,7 @@ Object.assign(componentMappings, {
 
   'grw-fab-container': <Fab />,
 });
+console.log(pageContainer.isForbidden);
 
 // additional definitions if data exists
 if (pageContainer.state.pageId != null) {

+ 3 - 1
src/client/js/components/Page/NotFoundAlert.jsx

@@ -11,6 +11,8 @@ const NotFoundAlert = (props) => {
     props.onPageCreateClicked(viewType);
   }
 
+  console.log(isForbidden);
+
   if (!isForbidden) {
     return null;
   }
@@ -39,7 +41,7 @@ const NotFoundAlert = (props) => {
 NotFoundAlert.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   onPageCreateClicked: PropTypes.func,
-  isForbidden: PropTypes.bool,
+  isForbidden: PropTypes.bool.isRequired,
 };
 
 export default withTranslation()(NotFoundAlert);

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

@@ -58,7 +58,7 @@ export default class PageContainer extends Container {
       sumOfBookmarks: 0,
       createdAt: mainContent.getAttribute('data-page-created-at'),
       updatedAt: mainContent.getAttribute('data-page-updated-at'),
-      isForbidden:  JSON.parse(mainContent.getAttribute('data-page-is-forbidden')),
+      isForbidden: JSON.parse(mainContent.getAttribute('data-page-is-forbidden')),
       isDeleted:  JSON.parse(mainContent.getAttribute('data-page-is-deleted')),
       isDeletable:  JSON.parse(mainContent.getAttribute('data-page-is-deletable')),
       isCreatable: JSON.parse(mainContent.getAttribute('data-page-is-creatable')),
@@ -79,6 +79,8 @@ export default class PageContainer extends Container {
       isHackmdDraftUpdatingInRealtime: false,
     };
 
+    console.log(this.state.isForbidden);
+
     // parse creator, lastUpdateUser and revisionAuthor
     try {
       this.state.creator = JSON.parse(mainContent.getAttribute('data-page-creator'));

+ 2 - 1
src/server/views/layout-growi/forbidden.html

@@ -2,10 +2,11 @@
 
 
 {% block content_main_before %}
+<div data-page-is-forbidden="true">
   {% include '../widget/page_alerts.html' %}
+</div>
 {% endblock %}
 
-
 {% block content_main %}
   <div class="row">
     <div class="col grw-page-content-container">

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

@@ -14,7 +14,7 @@
   data-page-grant-group-name="{{ grantedGroupName }}"
   data-page-is-liked="{% if user %}{{ page.isLiked(user) }}{% else %}false{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
-  data-page-is-forbidden="{% if forbidden %}true{% else %}false{% endif %}"
+  data-page-is-forbidden="false"
   data-page-is-deleted="{% if page.isDeleted() %}true{% else %}false{% endif %}"
   data-page-is-deletable="{% if isDeletablePage() %}true{% else %}false{% endif %}"
   data-page-is-creatable="false"