empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable editing of logged in user email in admin panel (#2031)

Browse Source 
Doing so has long resulted in an error when submitting the form. This
disables the input field when editing the logged in users details in the
admin panel.

The logged in user can still change their own email using the "Account
Settings" page accessed in the top left of the sidebar.
This commit is contained in:
Zachary Wasserman 2019-04-23 15:58:32 -07:00 committed by GitHub
parent 1f7cffba11
commit 3b349304fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/components/UserBlock/UserBlock.jsx
View File

@ -65,7 +65,7 @@ class UserBlock extends Component {
}
render () {
const { isEditing, isInvite, user, userErrors } = this.props;
const { isEditing, isInvite, user, userErrors, isCurrentUser } = this.props;
const {
admin,
email,
@ -131,6 +131,7 @@ class UserBlock extends Component {
return (
<div className={userWrapperClass}>
<EditUserForm
isCurrentUser={isCurrentUser}
onCancel={onToggleEditing}
handleSubmit={onEditUser}
formData={user}

4
frontend/components/forms/admin/EditUserForm/EditUserForm.jsx
View File

@ -11,6 +11,7 @@ const fieldNames = ['email', 'name', 'position', 'username', 'sso_enabled'];
class EditUserForm extends Component {
static propTypes = {
isCurrentUser: PropTypes.bool.isRequired,
onCancel: PropTypes.func,
handleSubmit: PropTypes.func,
fields: PropTypes.shape({
@ -23,7 +24,7 @@ class EditUserForm extends Component {
};
render () {
const { fields, handleSubmit, onCancel } = this.props;
const { fields, handleSubmit, onCancel, isCurrentUser } = this.props;
return (
<form className={baseClass} onSubmit={handleSubmit}>
@ -52,6 +53,7 @@ class EditUserForm extends Component {
{...fields.email}
inputWrapperClass={`${baseClass}__input-wrap`}
label="Email"
disabled={isCurrentUser}
labelClassName={`${baseClass}__label`}
inputClassName={`${baseClass}__input ${baseClass}__input--email`}
/>