diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 2c14965113..a860e0b58c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -15921,9 +15921,9 @@ } }, "seafile-js": { - "version": "0.2.93", - "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.93.tgz", - "integrity": "sha512-5stGnu5LJZj2MoN9ABjh/iYBpQpF5skbxmXZH4w4Vb1GVeQOWFz7oGWe0pSMMZvKriXN6GNRHB0K1nkL+OFBAg==", + "version": "0.2.94", + "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.94.tgz", + "integrity": "sha512-X7mYw2w9j4F/jSsy4g5LeigyqBZkKhvCf1y9OcKjhw/u4ZCqgztejjIKXVZwm18VtePOo4fxg5HooXn9pQoNUg==", "requires": { "axios": "^0.18.0", "form-data": "^2.3.2", diff --git a/frontend/package.json b/frontend/package.json index 872e365edf..3c3f0ae5f2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -37,7 +37,7 @@ "react-responsive": "^6.1.1", "react-select": "^2.4.1", "reactstrap": "^6.4.0", - "seafile-js": "^0.2.93", + "seafile-js": "^0.2.94", "socket.io-client": "^2.2.0", "sw-precache-webpack-plugin": "0.11.4", "unified": "^7.0.0", diff --git a/frontend/src/components/dialog/create-repo-dialog.js b/frontend/src/components/dialog/create-repo-dialog.js index 6fee61977a..410b263e6c 100644 --- a/frontend/src/components/dialog/create-repo-dialog.js +++ b/frontend/src/components/dialog/create-repo-dialog.js @@ -50,6 +50,10 @@ class CreateRepoDialog extends React.Component { let password = this.state.encrypt ? this.state.password1 : ''; let permission= this.state.permission; let repo = this.createRepo(repoName, password, permission); + if (this.props.libraryType === 'department') { + this.props.onCreateRepo(repo, 'department'); + return; + } this.props.onCreateRepo(repo); } } @@ -150,6 +154,12 @@ class CreateRepoDialog extends React.Component { permission: permission, }; } + if (libraryType === 'department') { + repo = { + repo_name: repoName, + passwd: password, + }; + } return repo; } diff --git a/frontend/src/components/dialog/internal-link-dialog.js b/frontend/src/components/dialog/internal-link-dialog.js index 368a967801..a72d7d5620 100644 --- a/frontend/src/components/dialog/internal-link-dialog.js +++ b/frontend/src/components/dialog/internal-link-dialog.js @@ -68,8 +68,8 @@ class InternalLinkDialog extends React.Component {

- {' '} + diff --git a/frontend/src/css/files-activities.css b/frontend/src/css/files-activities.css index b83fddccdb..9a409343d7 100644 --- a/frontend/src/css/files-activities.css +++ b/frontend/src/css/files-activities.css @@ -1,6 +1,16 @@ table tr .activity-date { border-top: 0; } -table td .activity-detail { +table .activity-detail { + word-break: break-word; +} +table .activity-detail div { display: inline; +} +table .activity-detail span { + color: #888; +} +table .activity-detail span:hover { + color: #333; + text-decoration: underline; } \ No newline at end of file diff --git a/frontend/src/pages/dashboard/files-activities.js b/frontend/src/pages/dashboard/files-activities.js index 0752e593f2..a462aca577 100644 --- a/frontend/src/pages/dashboard/files-activities.js +++ b/frontend/src/pages/dashboard/files-activities.js @@ -64,22 +64,9 @@ class ActivityItem extends Component { super(props); this.state = { isListCreatedFiles: false, - active: false, }; } - onMouseEnter = () => { - this.setState({ - active: true - }); - } - - onMouseLeave = () => { - this.setState({ - active: false - }); - } - onListCreatedFilesToggle = () => { this.setState({ isListCreatedFiles: !this.state.isListCreatedFiles, @@ -142,9 +129,9 @@ class ActivityItem extends Component { firstLine = firstLine.replace('{n}', fileCount); op = gettext('Created {n} files').replace('{n}', item.createdFilesCount); details = - -
{' '} - {this.state.active && } + +
{' '} + {gettext('details')}
{smallLibLink} ; } else if (item.obj_type == 'file') { @@ -239,7 +226,7 @@ class ActivityItem extends Component { {moment(item.time).format('YYYY-MM-DD')} } - + diff --git a/frontend/src/pages/groups/group-view.js b/frontend/src/pages/groups/group-view.js index d7c2e3359e..b59f531913 100644 --- a/frontend/src/pages/groups/group-view.js +++ b/frontend/src/pages/groups/group-view.js @@ -496,10 +496,11 @@ class GroupView extends React.Component { )} {this.state.isCreateRepoDialogShow && this.state.isDepartmentGroup && - } {this.state.showRenameGroupDialog &&