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

Repair wiki search bug (#4471)

Browse Source 
* repair search bug

* optimize code
This commit is contained in:
杨顺强
2020-03-06 18:24:53 +08:00
committed by GitHub
parent 91a8bf9c24
commit f6278c2c81
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/search/search.js
View File

@@ -100,7 +100,7 @@ class Search extends Component {
let isPublic = this.props.isPublic; let isPublic = this.props.isPublic;
if (isPublic) { if (isPublic) {
seafileAPI.searchFilesInPublishedRepo(queryData.q, queryData.search_repo).then(res => { seafileAPI.searchFilesInPublishedRepo(queryData.search_repo, queryData.q).then(res => {
if (!res.data.total) { if (!res.data.total) {
_this.setState({ _this.setState({
resultItems: [], resultItems: [],

28
frontend/src/pages/wiki/main-panel.js
View File

@@ -1,12 +1,13 @@
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { gettext, repoID, slug, siteRoot, username } from '../../utils/constants'; import { gettext, repoID, slug, siteRoot, username, isPro } from '../../utils/constants';
import CommonToolbar from '../../components/toolbar/common-toolbar';
import WikiMarkdownViewer from '../../components/wiki-markdown-viewer'; import WikiMarkdownViewer from '../../components/wiki-markdown-viewer';
import WikiDirListView from '../../components/wiki-dir-list-view/wiki-dir-list-view'; import WikiDirListView from '../../components/wiki-dir-list-view/wiki-dir-list-view';
import Loading from '../../components/loading'; import Loading from '../../components/loading';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import Search from '../../components/search/search'; import Search from '../../components/search/search';
import Notification from '../../components/common/notification';
import Account from '../../components/common/account';
const propTypes = { const propTypes = {
path: PropTypes.string.isRequired, path: PropTypes.string.isRequired,
@@ -76,6 +77,8 @@ class MainPanel extends Component {
render() { render() {
let { onSearchedClick, permission } = this.props;
let searchPlaceholder = gettext('Search files in this library');
const errMessage = (<div className="message err-tip">{gettext('Folder does not exist.')}</div>); const errMessage = (<div className="message err-tip">{gettext('Folder does not exist.')}</div>);
return ( return (
<div className="main-panel wiki-main-panel o-hidden"> <div className="main-panel wiki-main-panel o-hidden">
@@ -86,12 +89,9 @@ class MainPanel extends Component {
<span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title="Side Nav Menu" onClick={this.onMenuClick}></span> <span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title="Side Nav Menu" onClick={this.onMenuClick}></span>
</div> </div>
<div className="common-toolbar"> <div className="common-toolbar">
<Search {isPro && (
isPublic={true} <Search isPublic={true} repoID={repoID} onSearchedClick={onSearchedClick} placeholder={searchPlaceholder}/>
repoID={repoID} )}
onSearchedClick={this.props.onSearchedClick}
placeholder={gettext('Search files in this library')}
/>
</div> </div>
</Fragment> </Fragment>
} }
@@ -105,11 +105,13 @@ class MainPanel extends Component {
<span className="fa fa-pencil-alt mobile-toolbar-icon" title={gettext('Edit')} onClick={this.onEditClick} style={{'font-size': '1.1rem'}}></span> <span className="fa fa-pencil-alt mobile-toolbar-icon" title={gettext('Edit')} onClick={this.onEditClick} style={{'font-size': '1.1rem'}}></span>
)} )}
</div> </div>
<CommonToolbar <div className="common-toolbar">
repoID={repoID} {isPro && (
onSearchedClick={this.props.onSearchedClick} <Search isPublic={permission !== 'rw' && permission !== 'r'} repoID={repoID} onSearchedClick={onSearchedClick} placeholder={searchPlaceholder}/>
searchPlaceholder={gettext('Search files in this library')} )}
/> <Notification />
<Account />
</div>
</Fragment> </Fragment>
)} )}
</div> </div>