diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js index 07c3eebf54..dfc2c0995e 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-item.js +++ b/frontend/src/components/dirent-list-view/dirent-list-item.js @@ -414,11 +414,10 @@ class DirentListItem extends React.Component { } let isShowShareBtn = false; - - if (canGenerateShareLink) { - isShowShareBtn = true; - } else { - if (this.props.showShareBtn) { + if (this.props.showShareBtn) { + if (canGenerateShareLink) { + isShowShareBtn = true; + } else { if (dirent.type === 'dir') { isShowShareBtn = true; } else { @@ -437,7 +436,7 @@ class DirentListItem extends React.Component {
  • - {this.props.showShareBtn && isShowShareBtn && + {isShowShareBtn &&
  • @@ -467,7 +466,7 @@ class DirentListItem extends React.Component {
  • - {this.props.showShareBtn && isShowShareBtn && + {isShowShareBtn &&
  • diff --git a/frontend/src/components/dirent-list-view/dirent-list-view.js b/frontend/src/components/dirent-list-view/dirent-list-view.js index 3bffdc7925..5d824fb659 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-view.js +++ b/frontend/src/components/dirent-list-view/dirent-list-view.js @@ -461,7 +461,7 @@ class DirentListView extends React.Component { contextmenuList = this.props.showShareBtn ? [SHARE, DOWNLOAD, DELETE, 'Divider'] : [DOWNLOAD, DELETE, 'Divider']; if (dirent.type === 'file') { - contextmenuList = canGenerateShareLink ? [SHARE, DOWNLOAD, DELETE, 'Divider'] : [DOWNLOAD, DELETE, 'Divider'] + contextmenuList = canGenerateShareLink ? [SHARE, DOWNLOAD, DELETE, 'Divider'] : [DOWNLOAD, DELETE, 'Divider']; } } diff --git a/frontend/src/components/toolbar/markdown-viewer-toolbar.js b/frontend/src/components/toolbar/markdown-viewer-toolbar.js index 379e306a3d..221e864c0c 100644 --- a/frontend/src/components/toolbar/markdown-viewer-toolbar.js +++ b/frontend/src/components/toolbar/markdown-viewer-toolbar.js @@ -77,7 +77,7 @@ class MoreMenu extends React.PureComponent { {(this.props.openDialogs && editorMode === 'rich') && {gettext('Help')} } - {isSmall && {gettext('Share')}} + {isSmall && canGenerateShareLink && {gettext('Share')}} {isSmall && {gettext('Back to parent directory')}} {(isSmall && this.props.showFileHistory) && {gettext('File History')}