mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-22 11:57:34 +00:00
[Activities] 'Modified by': search modifiers by contact_emails and names (instead of by emails); changed the placeholder of the input from 'Search users' to 'Find modifiers' (#5856)
This commit is contained in:
@@ -51,6 +51,7 @@ class FilesActivities extends Component {
|
||||
availableUsers.push({
|
||||
email: item.author_email,
|
||||
name: item.author_name,
|
||||
contact_email: item.author_contact_email,
|
||||
avatar_url: item.avatar_url,
|
||||
isSelected: false
|
||||
});
|
||||
@@ -147,6 +148,7 @@ class FilesActivities extends Component {
|
||||
availableUsers.push({
|
||||
email: item.author_email,
|
||||
name: item.author_name,
|
||||
contact_email: item.author_contact_email,
|
||||
avatar_url: item.avatar_url,
|
||||
isSelected: false
|
||||
});
|
||||
|
@@ -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.email.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) : availableUsers;
|
||||
return (
|
||||
<div className="mt-4 position-relative">
|
||||
<span className="cur-activity-modifiers d-inline-block p-2 rounded" onClick={this.onToggleClick}>
|
||||
@@ -97,7 +97,7 @@ class UserSelector extends Component {
|
||||
<div className="px-3 pt-3">
|
||||
<Input
|
||||
type="text"
|
||||
placeholder={gettext('Search users')}
|
||||
placeholder={gettext('Find modifiers')}
|
||||
value={query}
|
||||
onChange={this.onQueryChange}
|
||||
/>
|
||||
|
Reference in New Issue
Block a user