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

Merge branch '7.0'

Browse Source
This commit is contained in:
plt 2019-06-24 17:32:31 +08:00
commit 20d7594d84
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/package-lock.json generated
View File

@ -433,9 +433,9 @@
"integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA==" "integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA=="
}, },
"@seafile/seafile-editor": { "@seafile/seafile-editor": {
"version": "0.2.40", "version": "0.2.41",
"resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.40.tgz", "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.41.tgz",
"integrity": "sha512-6xBlf06sF1o802aRAdps9tWE02qpl2Dd0x3s7aYTxp8MoN+2/S5Tqt85Y4fOWOt0ZSvAaK48K7v7DCVoW3jKMQ==", "integrity": "sha512-avaxxHbnJugB4c6PI/Ov2rOUn+D5XnhMC4M72LK/HKT4MTMsYhvnf2LU/ZMdXX5y0YkLyoqCPFJZnsN0B4oucw==",
"requires": { "requires": {
"@seafile/slate-react": "^0.1.8", "@seafile/slate-react": "^0.1.8",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",

2
frontend/package.json
View File

@ -6,7 +6,7 @@
"@reach/router": "^1.2.0", "@reach/router": "^1.2.0",
"@seafile/dtable": "0.0.37", "@seafile/dtable": "0.0.37",
"@seafile/resumablejs": "^1.1.9", "@seafile/resumablejs": "^1.1.9",
"@seafile/seafile-editor": "^0.2.40", "@seafile/seafile-editor": "^0.2.41",
"MD5": "^1.3.0", "MD5": "^1.3.0",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
"classnames": "^2.2.6", "classnames": "^2.2.6",

4
frontend/src/components/dialog/lib-sub-folder-set-group-permission-dialog.js
View File

@ -149,7 +149,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component {
const request = this.props.isDepartmentRepo ? const request = this.props.isDepartmentRepo ?
seafileAPI.addDepartmentRepoGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id) : seafileAPI.addDepartmentRepoGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id) :
seafileAPI.addGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id) seafileAPI.addGroupFolderPerm(this.props.repoID, this.state.permission, folderPath, selectedOption.id);
request.then(res => { request.then(res => {
let errorMsg = []; let errorMsg = [];
if (res.data.failed.length > 0) { if (res.data.failed.length > 0) {
@ -185,7 +185,7 @@ class LibSubFolderSerGroupPermissionDialog extends React.Component {
deleteGroupPermissionItem = (item) => { deleteGroupPermissionItem = (item) => {
const request = this.props.isDepartmentRepo ? const request = this.props.isDepartmentRepo ?
seafileAPI.deleteDepartmentRepoGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id) : seafileAPI.deleteDepartmentRepoGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id) :
seafileAPI.deleteGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id) seafileAPI.deleteGroupFolderPerm(item.repo_id, item.permission, item.folder_path, item.group_id);
request.then(() => { request.then(() => {
this.setState({ this.setState({
groupPermissionItems: this.state.groupPermissionItems.filter(deletedItem => { return deletedItem != item; }) groupPermissionItems: this.state.groupPermissionItems.filter(deletedItem => { return deletedItem != item; })

4
frontend/src/components/dirent-detail/dirent-details.js
View File

@ -202,7 +202,7 @@ class DirentDetail extends React.Component {
} }
let direntName = dirent ? dirent.name : folderDirent.name; let direntName = dirent ? dirent.name : folderDirent.name;
if (dirent && dirent.type === 'file') { if ((dirent && dirent.type === 'file') || path.lastIndexOf('.') > -1) {
return ( return (
<div className="detail-container"> <div className="detail-container">
{this.renderHeader(smallIconUrl, direntName)} {this.renderHeader(smallIconUrl, direntName)}
@ -212,7 +212,7 @@ class DirentDetail extends React.Component {
<TabPane tabId="comments" className="comments h-100"> <TabPane tabId="comments" className="comments h-100">
<DetailCommentList <DetailCommentList
repoID={this.props.repoID} repoID={this.props.repoID}
filePath={this.props.path + dirent.name} filePath={(dirent && dirent.type === 'file') ? path + dirent.name : path}
/> />
</TabPane> </TabPane>
</TabContent> </TabContent>

1
frontend/src/components/review-list-view/review-comments.js
View File

@ -4,7 +4,6 @@ import { processor } from '../../utils/seafile-markdown2html';
import { Button, Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { Button, Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import { gettext, draftFilePath, draftRepoID } from '../../utils/constants'; import { gettext, draftFilePath, draftRepoID } from '../../utils/constants';
import Loading from '../../components/loading.js';
import { username } from '../../utils/constants.js'; import { username } from '../../utils/constants.js';
import '../../css/review-comments.css'; import '../../css/review-comments.css';

2
frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
View File

@ -164,7 +164,7 @@ class SharedRepoListItem extends React.Component {
} }
onItemDeleteToggle = () => { onItemDeleteToggle = () => {
this.setState({isDeleteDialogShow: !this.state.isDeleteDialogShow}) this.setState({isDeleteDialogShow: !this.state.isDeleteDialogShow});
} }
toggleShareDialog = () => { toggleShareDialog = () => {

2
frontend/src/wiki.js
View File

@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
import moment from 'moment'; import moment from 'moment';
import MediaQuery from 'react-responsive'; import MediaQuery from 'react-responsive';
import { Modal } from 'reactstrap'; import { Modal } from 'reactstrap';
import { slug, repoID, siteRoot, initialPath, isDir, sharedToken, hasIndex } from './utils/constants'; import { slug, siteRoot, initialPath, isDir, sharedToken, hasIndex } from './utils/constants';
import { Utils } from './utils/utils'; import { Utils } from './utils/utils';
import { seafileAPI } from './utils/seafile-api'; import { seafileAPI } from './utils/seafile-api';
import Dirent from './models/dirent'; import Dirent from './models/dirent';