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

Merge pull request #2939 from weseek/fix/hide-three-stranded-buttons-in-restricted-page

Fix/hide three stranded buttons in restricted page
Yuki Takei 5 лет назад
Родитель
Сommit
d18e550280

+ 3 - 1
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -147,6 +147,8 @@ const GrowiSubNavigation = (props) => {
   const isUserPage = pageUser != null;
   const isPageInTrash = isTrashPage(path);
 
+  console.log(isPageForbidden);
+
   function onThreeStrandedButtonClicked(viewType) {
     navigationContainer.setEditorMode(viewType);
   }
@@ -193,7 +195,7 @@ const GrowiSubNavigation = (props) => {
             { !isPageNotFound && !isPageForbidden && <PageManagement /> }
           </div>
           <div className="mt-2">
-            { !isCreatable && !isPageInTrash
+            { !isCreatable && !isPageInTrash && !isPageForbidden
             && (
             <ThreeStrandedButton
               onThreeStrandedButtonClicked={onThreeStrandedButtonClicked}

+ 1 - 0
src/server/views/widget/forbidden_content.html

@@ -10,6 +10,7 @@
 <div id="content-main" class="content-main page-list"
   data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
+  data-page-is-forbidden="true"
   >
 
   <div class="row row-alerts d-edit-none">

+ 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"