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

repair wiki bug (#2344)

Browse Source 
* repair wiki bug

* optimized code

* optimized code
This commit is contained in:
shanshuirenjia
2018-09-05 17:44:14 +08:00
committed by Daniel Pan
parent 508f5c705f
commit eab6c6fe61
8 changed files with 123 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/tree-view/tree-node-view.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import MenuControl from '../menu-component/node-menu-control'
import MenuControl from '../menu-component/node-menu-control';
import { permission } from '../constance';
function sortByType(a, b) {
if (a.type == "dir" && b.type != "dir") {
@@ -110,7 +111,6 @@ class TreeNodeView extends React.Component {
paddingLeft={this.props.paddingLeft}
treeView={this.props.treeView}
isNodeItemFrezee={this.props.isNodeItemFrezee}
permission={this.props.permission}
currentFilePath={this.props.currentFilePath}
onDirCollapse={this.props.onDirCollapse}
/>
@@ -124,7 +124,7 @@ class TreeNodeView extends React.Component {
}
renderMenuController() {
if (this.props.permission === "rw") {
if (permission === "True") {
let isShow = (this.props.node.path === this.props.currentFilePath);
return (
<div className="right-icon">

7
frontend/src/components/tree-view/tree.js
View File

@@ -1,5 +1,6 @@
import Node from './node';
import moment from 'moment';
import { bytesToSize } from '../utils';
class Tree {
@@ -172,7 +173,7 @@ class Tree {
var node = new Node({
name: model.name,
type: model.type,
size: model.size,
size: bytesToSize(model.size),
last_update_time: moment.unix(model.last_update_time).fromNow(),
isExpanded: false
});
@@ -200,7 +201,7 @@ class Tree {
let node = new Node({
name: nodeObj.name,
type: nodeObj.type,
size: nodeObj.size,
size: bytesToSize(nodeObj.size),
last_update_time: moment.unix(nodeObj.last_update_time).fromNow(),
isExpanded: false
});
@@ -226,7 +227,7 @@ class Tree {
var node = new Node({
name: node.name,
type: node.type,
size: node.size,
size: bytesToSize(node.size),
last_update_time: moment.unix(node.last_update_time).fromNow(),
isExpanded: false
});