haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 23:29:49 +00:00
Code Issues Releases Wiki Activity

remove useless paras (#6302)

Browse Source
This commit is contained in:
Michael An
2024-07-05 15:43:50 +08:00
committed by GitHub
parent 6e45dfba13
commit 7e92731635
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/dialog/add-wiki-dialog.js
View File

@@ -7,8 +7,6 @@ import { Utils } from '../../utils/utils';
import toaster from '../toast'; import toaster from '../toast';
import { SeahubSelect } from '../common/select'; import { SeahubSelect } from '../common/select';
const { multiTenancy, cloudMode } = window.app.pageOptions;
const propTypes = { const propTypes = {
toggleCancel: PropTypes.func.isRequired, toggleCancel: PropTypes.func.isRequired,
addWiki: PropTypes.func.isRequired, addWiki: PropTypes.func.isRequired,
@@ -25,11 +23,10 @@ class AddWikiDialog extends React.Component {
selectedOption: null, selectedOption: null,
options: [], options: [],
}; };
this.isDepartment = isPro && multiTenancy && cloudMode;
} }
componentDidMount() { componentDidMount() {
if (!this.isDepartment) return; if (!isPro) return;
wikiAPI.listWikiDepartments().then(res => { wikiAPI.listWikiDepartments().then(res => {
const departments = res.data.sort((a, b) => { const departments = res.data.sort((a, b) => {
return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1; return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
@@ -88,7 +85,7 @@ class AddWikiDialog extends React.Component {
<ModalBody> <ModalBody>
<Label>{gettext('Name')}</Label> <Label>{gettext('Name')}</Label>
<Input onKeyDown={this.handleKeyDown} autoFocus={true} value={this.state.name} onChange={this.inputNewName}/> <Input onKeyDown={this.handleKeyDown} autoFocus={true} value={this.state.name} onChange={this.inputNewName}/>
{this.isDepartment && {isPro &&
<> <>
<Label className='mt-4'>{gettext('Wiki owner')} ({gettext('Optional')})</Label> <Label className='mt-4'>{gettext('Wiki owner')} ({gettext('Optional')})</Label>
<SeahubSelect <SeahubSelect

5
frontend/src/components/wiki-card-view/wiki-card-view.js
View File

@@ -8,8 +8,6 @@ import toaster from '../toast';
import './wiki-card-view.css'; import './wiki-card-view.css';
const { multiTenancy, cloudMode } = window.app.pageOptions;
const propTypes = { const propTypes = {
data: PropTypes.object.isRequired, data: PropTypes.object.isRequired,
deleteWiki: PropTypes.func.isRequired, deleteWiki: PropTypes.func.isRequired,
@@ -24,11 +22,10 @@ class WikiCardView extends Component {
this.state = { this.state = {
departmentMap: {}, departmentMap: {},
}; };
this.isDepartment = isPro && multiTenancy && cloudMode;
} }
componentDidMount() { componentDidMount() {
if (!canPublishRepo || !this.isDepartment) return; if (!canPublishRepo || !isPro) return;
let departmentMap = {}; let departmentMap = {};
wikiAPI.listWikiDepartments().then(res => { wikiAPI.listWikiDepartments().then(res => {
res.data.forEach(item => departmentMap[item.id] = true); res.data.forEach(item => departmentMap[item.id] = true);

2
seahub/templates/base_for_react.html
View File

@@ -67,8 +67,6 @@
canAddRepo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %}, canAddRepo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %},
canShareRepo: {% if user.permissions.can_share_repo %} true {% else %} false {% endif %}, canShareRepo: {% if user.permissions.can_share_repo %} true {% else %} false {% endif %},
canAddGroup: {% if user.permissions.can_add_group %} true {% else %} false {% endif %}, canAddGroup: {% if user.permissions.can_add_group %} true {% else %} false {% endif %},
multiTenancy: {% if multi_tenancy %} true {% else %} false {% endif %},
cloudMode: {% if cloud_mode %} true {% else %} false {% endif %},
groupImportMembersExtraMsg: "{{group_import_members_extra_msg}}", groupImportMembersExtraMsg: "{{group_import_members_extra_msg}}",
canGenerateShareLink: {% if user.permissions.can_generate_share_link %} true {% else %} false {% endif %}, canGenerateShareLink: {% if user.permissions.can_generate_share_link %} true {% else %} false {% endif %},
canGenerateUploadLink: {% if user.permissions.can_generate_upload_link %} true {% else %} false {% endif %}, canGenerateUploadLink: {% if user.permissions.can_generate_upload_link %} true {% else %} false {% endif %},