Răsfoiți Sursa

Merge pull request #3103 from weseek/feat/gw-4462

feat/gw-4462
itizawa 5 ani în urmă
părinte
comite
c383a8759a

+ 6 - 6
src/client/js/components/PageAccessoriesModal.jsx

@@ -48,7 +48,7 @@ const PageAccessoriesModal = (props) => {
         Icon: HistoryIcon,
         i18n: t('History'),
         index: 2,
-        isLinkEnabled: v => !isSharedUser,
+        isLinkEnabled: v => !isGuestUser && !isSharedUser,
       },
       attachment: {
         Icon: AttachmentIcon,
@@ -59,7 +59,7 @@ const PageAccessoriesModal = (props) => {
         Icon: ShareLinkIcon,
         i18n: t('share_links.share_link_management'),
         index: 4,
-        isLinkEnabled: v => !isGuestUser || !isSharedUser,
+        isLinkEnabled: v => !isGuestUser && !isSharedUser,
       },
     };
   }, [t, isGuestUser, isSharedUser]);
@@ -109,11 +109,11 @@ const PageAccessoriesModal = (props) => {
             <TabPane tabId="timeline">
               {activeComponents.has('timeline') && <PageTimeline /> }
             </TabPane>
-            <TabPane tabId="pageHistory">
-              <div className="overflow-auto">
+            {!isGuestUser && (
+              <TabPane tabId="pageHistory">
                 {activeComponents.has('pageHistory') && <PageHistory /> }
-              </div>
-            </TabPane>
+              </TabPane>
+            )}
             <TabPane tabId="attachment">
               {activeComponents.has('attachment') && <PageAttachment />}
             </TabPane>

+ 1 - 1
src/client/js/components/PageAccessoriesModalControl.jsx

@@ -35,7 +35,7 @@ const PageAccessoriesModalControl = (props) => {
       {
         name: 'pageHistory',
         Icon: <HistoryIcon />,
-        disabled: isSharedUser,
+        disabled: isGuestUser || isSharedUser,
       },
       {
         name: 'attachment',