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

Merge branch '11.0'

Browse Source
This commit is contained in:
lian
2024-09-24 13:28:58 +08:00
parent 1229577a12 99bc3150ca
commit ce2eb2b407
26 changed files with 189 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/src/components/user-select.js
View File

@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import AsyncSelect from 'react-select/async';
import { seafileAPI } from '../utils/seafile-api';
import { gettext, enableShowContactEmailWhenSearchUser } from '../utils/constants';
import { gettext, enableShowContactEmailWhenSearchUser, enableShowLoginIDWhenSearchUser } from '../utils/constants';
import { Utils } from '../utils/utils';
import toaster from './toast';
import { UserSelectStyle } from './common/select';
@@ -54,24 +54,21 @@ class UserSelect extends React.Component {
let obj = {};
obj.value = item.name;
obj.email = item.email;
if (enableShowContactEmailWhenSearchUser) {
obj.label = (
<div className="d-flex">
<img src={item.avatar_url} className="avatar" width="24" alt="" />
<div className="ml-2">
<span className="user-option-name">{item.name}</span><br />
<span className="user-option-email">{item.contact_email}</span>
</div>
obj.label = (enableShowContactEmailWhenSearchUser || enableShowLoginIDWhenSearchUser) ? (
<div className="d-flex">
<img src={item.avatar_url} className="avatar" width="24" alt="" />
<div className="ml-2">
<span className="user-option-name">{item.name}</span><br />
{enableShowContactEmailWhenSearchUser && <span className="user-option-email">{item.contact_email}</span>}
{enableShowLoginIDWhenSearchUser && <span className="user-option-email">{item.login_id}</span>}
</div>
);
} else {
obj.label = (
<>
<img src={item.avatar_url} className="select-module select-module-icon avatar" alt=""/>
<span className='select-module select-module-name'>{item.name}</span>
</>
);
}
</div>
) : (
<React.Fragment>
<img src={item.avatar_url} className="select-module select-module-icon avatar" alt=""/>
<span className='select-module select-module-name'>{item.name}</span>
</React.Fragment>
);
this.options.push(obj);
}
callback(this.options);

12
frontend/src/components/user-settings/user-basic-info-form.js
View File

@@ -5,7 +5,8 @@ import { gettext } from '../../utils/constants';
const {
nameLabel,
enableUpdateUserInfo,
enableUserSetContactEmail
enableUserSetContactEmail,
enableUserSetName
} = window.app.pageOptions;
class UserBasicInfoForm extends React.Component {
@@ -38,9 +39,10 @@ class UserBasicInfoForm extends React.Component {
handleSubmit = (e) => {
e.preventDefault();
let data = {
name: this.state.name
};
let data = {};
if (enableUserSetName) {
data.name = this.state.name;
}
if (enableUserSetContactEmail) {
data.contact_email = this.state.contactEmail;
}
@@ -60,7 +62,7 @@ class UserBasicInfoForm extends React.Component {
<div className="form-group row">
<label className="col-sm-1 col-form-label" htmlFor="name">{nameLabel}</label>
<div className="col-sm-5">
<input className="form-control" id="name" type="text" name="nickname" value={name} disabled={!enableUpdateUserInfo} onChange={this.handleNameInputChange} />
<input className="form-control" id="name" type="text" name="nickname" value={name} disabled={!enableUpdateUserInfo || !enableUserSetName} onChange={this.handleNameInputChange} />
</div>
</div>