tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2900-Mensajes-de-Error-y-Success-al-mismo-tiempo-en-la-edición-de-usuarios_2' into 'develop' 

Display an error message when no changes have been made - #2900

See merge request artica/pandorafms!1948
This commit is contained in:
vgilc 2018-11-08 12:27:45 +01:00
parent d28b229423 85adf7cf8d
commit 7afc328e50
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/operation/users/user_edit.php
View File

@ -160,7 +160,9 @@ if (isset ($_GET["modified"]) && !$view_mode) {
// message could be confussing to the user. // message could be confussing to the user.
if($return){ if($return){
if(!empty($password_new) && !empty($password_confirm)){
$success_msg = __('Password successfully updated'); $success_msg = __('Password successfully updated');
}
$return_update_user = update_user ($id, $upd_info); $return_update_user = update_user ($id, $upd_info);
@ -170,6 +172,15 @@ if (isset ($_GET["modified"]) && !$view_mode) {
elseif($return_update_user == true){ elseif($return_update_user == true){
$success_msg = __('User info successfully updated'); $success_msg = __('User info successfully updated');
} }
else{
if(!empty($password_new) && !empty($password_confirm)){
$success_msg = __('Password successfully updated');
}
else{
$return=false;
$error_msg = __('No changes have been made');
}
}
$user_info = $upd_info; $user_info = $upd_info;
} }