oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug that wouldn't allow admins to save a user profile if email address is required

Browse source
This commit is contained in:
Frank Dillon 2008-12-23 03:35:58 +00:00
parent d05c0af5af
commit 18dd11345c
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/ProfileField.pm
View file

@ -505,7 +505,7 @@ sub getPasswordRecoveryFields {
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 isDuplicate( fieldValue ) =head2 isDuplicate( fieldValue, userId )
Checks the value of the field to see if it is duplicated in the system. Returns true of false. Checks the value of the field to see if it is duplicated in the system. Returns true of false.
@ -513,6 +513,10 @@ Checks the value of the field to see if it is duplicated in the system. Returns
value to check for duplicates against value to check for duplicates against
=head3 userId
userId to check for duplicates againts
=cut =cut
sub isDuplicate { sub isDuplicate {
@ -520,9 +524,10 @@ sub isDuplicate {
my $session = $self->session; my $session = $self->session;
my $fieldId = $self->getId; my $fieldId = $self->getId;
my $value = shift; my $value = shift;
my $userId = shift || $session->user->userId;
my $sql = qq{select count(*) from userProfileData where $fieldId = ? and userId <> ?}; my $sql = qq{select count(*) from userProfileData where $fieldId = ? and userId <> ?};
my $duplicate = $session->db->quickScalar($sql,[$value, $session->user->userId]); my $duplicate = $session->db->quickScalar($sql,[$value, $userId]);
return ($duplicate > 0); return ($duplicate > 0);
} }

2
lib/WebGUI/User.pm
View file

@ -1190,7 +1190,7 @@ sub validateProfileDataFromForm {
push(@{$errorFields},$fieldId); push(@{$errorFields},$fieldId);
} }
#Duplicate emails throw warnings #Duplicate emails throw warnings
elsif($fieldId eq "email" && $field->isDuplicate($fieldValue)) { elsif($fieldId eq "email" && $field->isDuplicate($fieldValue,$self->userId)) {
$errorCat = $field->get("profileCategoryId") unless (defined $errorCat); $errorCat = $field->get("profileCategoryId") unless (defined $errorCat);
push (@{$warnings},$i18n->get(1072)); push (@{$warnings},$i18n->get(1072));
push(@{$warnFields},$fieldId); push(@{$warnFields},$fieldId);