Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@
"Element is not connected": "Element is not connected",
"Element": "Element",
"Email Address": "Email Address",
"Email address for users created via SAML synchronization cannot be edited manually.": "Email address for users created via SAML synchronization cannot be edited manually.",
"Email": "Email",
"Embed Media": "Embed Media",
"Embed URL": "Embed URL",
Expand Down
11 changes: 9 additions & 2 deletions resources/views/admin/users/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,16 @@
}
return true
},

profileUpdate($event) {
if(this.emailHasChanged && !this.ssoUser) {
$('#validateModal').modal('show');
if (this.emailHasChanged) {
if (this.ssoUser) {
let message = 'Email address for users created via SAML synchronization cannot be edited manually.';
ProcessMaker.alert(this.$t(message), 'warning');
return;
} else {
$('#validateModal').modal('show');
}
} else {
this.saveProfileChanges();
}
Expand Down
10 changes: 8 additions & 2 deletions resources/views/profile/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,14 @@
modalVueInstance.$refs.updateAvatarModal.show();
},
profileUpdate() {
if(this.emailHasChanged && !this.ssoUser) {
$('#validateModal').modal('show');
if(this.emailHasChanged) {
if (this.ssoUser) {
let message = 'Email address for users created via SAML synchronization cannot be edited manually.';
ProcessMaker.alert(this.$t(message), 'warning');
return;
} else {
$('#validateModal').modal('show');
}
} else {
this.saveProfileChanges();
}
Expand Down
Loading