diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-10-16 23:25:00 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-10-16 23:25:00 +0200 |
| commit | bb85be28137ca2a822eb8164421072d8a088661e (patch) | |
| tree | 15c1f039e982760c4708c950c76b8f378646d375 /Bugzilla/WebService/User.pm | |
| parent | 7d0b9d75d0c57661729ff931ee283675016b53f2 (diff) | |
| download | bugzilla-bb85be28137ca2a822eb8164421072d8a088661e.tar.gz bugzilla-bb85be28137ca2a822eb8164421072d8a088661e.tar.xz | |
Bug 577329 - WebServices should filter email addresses same as the web UI as users are not always required to login
Diffstat (limited to 'Bugzilla/WebService/User.pm')
| -rw-r--r-- | Bugzilla/WebService/User.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm index 93c0881cb..d9fc890f7 100644 --- a/Bugzilla/WebService/User.pm +++ b/Bugzilla/WebService/User.pm @@ -157,8 +157,8 @@ sub get { \@user_objects, $params); @users = map {filter $params, { id => $self->type('int', $_->id), - real_name => $self->type('string', $_->name), - name => $self->type('string', $_->login), + real_name => $self->type('string', $_->name), + name => $self->type('email', $_->login), }} @$in_group; return { users => \@users }; @@ -199,7 +199,7 @@ sub get { } } } - + my $in_group = $self->_filter_users_by_group( \@user_objects, $params); if (Bugzilla->user->in_group('editusers')) { @@ -207,8 +207,8 @@ sub get { map {filter $params, { id => $self->type('int', $_->id), real_name => $self->type('string', $_->name), - name => $self->type('string', $_->login), - email => $self->type('string', $_->email), + name => $self->type('email', $_->login), + email => $self->type('email', $_->email), can_login => $self->type('boolean', $_->is_enabled ? 1 : 0), groups => $self->_filter_bless_groups($_->groups), email_enabled => $self->type('boolean', $_->email_enabled), @@ -221,8 +221,8 @@ sub get { map {filter $params, { id => $self->type('int', $_->id), real_name => $self->type('string', $_->name), - name => $self->type('string', $_->login), - email => $self->type('string', $_->email), + name => $self->type('email', $_->login), + email => $self->type('email', $_->email), can_login => $self->type('boolean', $_->is_enabled ? 1 : 0), groups => $self->_filter_bless_groups($_->groups), saved_searches => [map { $self->_query_to_hash($_) } @{ $_->queries }], |