haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity

repair path nav bug

Browse Source
This commit is contained in:
shanshuirenjia
2018-12-11 18:05:57 +08:00
parent f1eb4c625f
commit 5136b50498
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app.js
View File

@@ -1,6 +1,6 @@
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Router } from '@reach/router'; import { Router, Link } from '@reach/router';
import { gettext, siteRoot } from './utils/constants'; import { gettext, siteRoot } from './utils/constants';
import SidePanel from './components/side-panel'; import SidePanel from './components/side-panel';
import MainPanel from './components/main-panel'; import MainPanel from './components/main-panel';
@@ -113,9 +113,9 @@ class App extends Component {
if (groupID) { //group if (groupID) { //group
return ( return (
<Fragment> <Fragment>
<a href={siteRoot + 'groups/'} className="normal">{gettext('Groups')}</a> <Link to={siteRoot + 'groups/'} className="normal">{gettext('Groups')}</Link>
<span className="path-split">/</span> <span className="path-split">/</span>
<a href={siteRoot + 'group/' + groupID + '/'} className="normal">{currentTab}</a> <Link to={siteRoot + 'group/' + groupID + '/'} className="normal">{currentTab}</Link>
<span className="path-split">/</span> <span className="path-split">/</span>
</Fragment> </Fragment>
); );
@@ -123,7 +123,7 @@ class App extends Component {
if (currentTab === 'my-libs') { if (currentTab === 'my-libs') {
return ( return (
<Fragment> <Fragment>
<a href={siteRoot + 'my-libs/'} className="normal">{gettext('Libraries')}</a> <Link to={siteRoot + 'my-libs/'} className="normal">{gettext('Libraries')}</Link>
<span className="path-split">/</span> <span className="path-split">/</span>
</Fragment> </Fragment>
); );
@@ -131,7 +131,7 @@ class App extends Component {
if (currentTab === 'shared-libs') { if (currentTab === 'shared-libs') {
return ( return (
<Fragment> <Fragment>
<a href={siteRoot + 'shared-libs/'} className="normal">{gettext('Shared with me')}</a> <Link to={siteRoot + 'shared-libs/'} className="normal">{gettext('Shared with me')}</Link>
<span className="path-split">/</span> <span className="path-split">/</span>
</Fragment> </Fragment>
); );

3
frontend/src/pages/groups/group-view.js
View File

@@ -1,6 +1,7 @@
import React,{ Fragment } from 'react'; import React,{ Fragment } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { gettext, siteRoot, username, loginUrl } from '../../utils/constants'; import { gettext, siteRoot, username, loginUrl } from '../../utils/constants';
import { Link } from '@reach/router';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import Loading from '../../components/loading'; import Loading from '../../components/loading';
import ModalPortal from '../../components/modal-portal'; import ModalPortal from '../../components/modal-portal';
@@ -202,7 +203,7 @@ class GroupView extends React.Component {
{currentGroup && ( {currentGroup && (
<Fragment> <Fragment>
<div className="path-container"> <div className="path-container">
<a href={`${siteRoot}groups/`}>{gettext("Groups")}</a> <Link to={`${siteRoot}groups/`}>{gettext("Groups")}</Link>
<span className="path-split">/</span> <span className="path-split">/</span>
<span>{currentGroup.name}</span> <span>{currentGroup.name}</span>
{currentGroup.parent_group_id !== 0 && ( {currentGroup.parent_group_id !== 0 && (