haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 19:00:12 +00:00
Code Issues Releases Wiki Activity

Merge branch '12.0'

Browse Source
This commit is contained in:
r350178982
2025-10-14 10:20:19 +08:00
parent 9ac1ddad03 83fbfdaeee
commit f59a8e6683
10 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/file-view/file-toolbar.js
View File

@@ -259,6 +259,16 @@ class FileToolbar extends React.Component {
<a href={`${siteRoot}library/${repoID}/${Utils.encodePath(repoName + parentDir)}`} className="dropdown-item">
{gettext('Open parent folder')}
</a>
{isTxt &&
<DropdownItem id='txt-line-wrap-menu' className='dropdown-item'>
<Switch
checked={this.props.lineWrapping}
placeholder={gettext('Line wrapping')}
className="txt-line-wrap-menu w-100"
onChange={() => this.props.updateLineWrapping(!this.props.lineWrapping)}
/>
</DropdownItem>
}
</DropdownMenu>
</Dropdown>
</div>

1
frontend/src/models/activity.js
View File

@@ -14,6 +14,7 @@ class Acticity {
this.op_type = json.op_type;
this.createdFilesCount = 0;
this.createdFilesList = [];
this.login_id = json.login_id;
if (json.op_type === 'clean-up-trash') {
this.days = json.days;
} else if (json.op_type === 'rename' && json.obj_type === 'repo') {

6
frontend/src/pages/dashboard/files-activities.js
View File

@@ -81,7 +81,8 @@ class FilesActivities extends Component {
name: item.author_name,
contact_email: item.author_contact_email,
avatar_url: item.avatar_url,
isSelected: false
isSelected: false,
login_id: item.login_id
});
}
});
@@ -181,7 +182,8 @@ class FilesActivities extends Component {
name: item.author_name,
contact_email: item.author_contact_email,
avatar_url: item.avatar_url,
isSelected: false
isSelected: false,
login_id: item.login_id,
});
}
});

2
frontend/src/pages/dashboard/user-selector.js
View File

@@ -69,7 +69,7 @@ class UserSelector extends Component {
const { isPopoverOpen, query } = this.state;
const { currentSelectedUsers, availableUsers } = this.props;
const selectedUsers = availableUsers.filter(item => item.isSelected);
const filteredAvailableUsers = query.trim() ? availableUsers.filter(item => item.contact_email.indexOf(query.trim()) != -1 || item.name.indexOf(query.trim()) != -1) : availableUsers;
const filteredAvailableUsers = query.trim() ? availableUsers.filter(item => item.contact_email.indexOf(query.trim()) != -1 || item.name.indexOf(query.trim()) != -1 || item.login_id.indexOf(query.trim()) != -1) : availableUsers;
return (
<div className="mt-4 position-relative">
<span