From 8eb85a8a8eb72d91f545bc107c70a9656301551b Mon Sep 17 00:00:00 2001 From: C_Q Date: Mon, 24 Dec 2018 12:24:16 +0800 Subject: [PATCH] fix activities link (#2705) --- frontend/src/pages/dashboard/files-activities.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/frontend/src/pages/dashboard/files-activities.js b/frontend/src/pages/dashboard/files-activities.js index 9b49f8683c..4e573b83c2 100644 --- a/frontend/src/pages/dashboard/files-activities.js +++ b/frontend/src/pages/dashboard/files-activities.js @@ -2,6 +2,7 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { seafileAPI } from '../../utils/seafile-api'; import { gettext, siteRoot } from '../../utils/constants'; +import { Utils } from '../../utils/utils'; const contentPropTypes = { data: PropTypes.object.isRequired, @@ -47,21 +48,12 @@ const tablePropTypes = { class TableBody extends Component { - encodePath(path) { - let path_arr = path.split('/'); - let path_arr_ = []; - for (let i = 0, len = path_arr.length; i < len; i++) { - path_arr_.push(encodeURIComponent(path_arr[i])); - } - return path_arr_.join('/'); - } - render() { let listFilesActivities = this.props.items.map(function(item, index) { let op, details; let userProfileURL = `${siteRoot}profile/${encodeURIComponent(item.author_email)}/`; - let libURL = `${siteRoot}#common/lib/${item.repo_id}`; + let libURL = siteRoot + 'library/' + item.repo_id + '/' + encodeURIComponent(item.repo_name) + '/'; let libLink = {item.repo_name}; let smallLibLink = {item.repo_name}; @@ -93,7 +85,7 @@ class TableBody extends Component { break; } } else if (item.obj_type == 'file') { - let fileURL = `${siteRoot}lib/${item.repo_id}/file${this.encodePath(item.path)}`; + let fileURL = `${siteRoot}lib/${item.repo_id}/file${Utils.encodePath(item.path)}`; let fileLink = {item.name}; switch(item.op_type) { case 'create': @@ -123,7 +115,7 @@ class TableBody extends Component { break; } } else { // dir - let dirURL = `${siteRoot}#common/lib/${item.repo_id}${this.encodePath(item.path)}`; + let dirURL = siteRoot + 'library/' + item.repo_id + '/' + encodeURIComponent(item.repo_name) + Utils.encodePath(item.path); let dirLink = {item.name}; switch(item.op_type) { case 'create':