1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 22:54:11 +00:00

Merge branch 'master' into 12.0

This commit is contained in:
杨顺强
2024-04-25 14:29:17 +08:00
53 changed files with 761 additions and 211 deletions

View File

@@ -179,7 +179,7 @@ class DirOperationToolbar extends React.Component {
let content = null;
if (Utils.isDesktop()) {
let { showShareBtn } = this.props;
const { showShareBtn, repoEncrypted } = this.props;
content = (
<Fragment>
{canUpload && (
@@ -210,7 +210,7 @@ class DirOperationToolbar extends React.Component {
<button className="dropdown-item" onClick={this.onCreateExcelToggle} role="menuitem">{gettext('New Excel File')}</button>
<button className="dropdown-item" onClick={this.onCreatePPTToggle} role="menuitem">{gettext('New PowerPoint File')}</button>
<button className="dropdown-item" onClick={this.onCreateWordToggle} role="menuitem">{gettext('New Word File')}</button>
{enableSeadoc && <button className="dropdown-item" onClick={this.onCreateSeaDocToggle} role="menuitem">{gettext('New SeaDoc File')} (beta)</button>}
{enableSeadoc && !repoEncrypted && <button className="dropdown-item" onClick={this.onCreateSeaDocToggle} role="menuitem">{gettext('New SeaDoc File')} (beta)</button>}
</div>
)}
</Fragment>