diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-13 15:45:24 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-13 15:45:24 +0200 |
| commit | 1d48904ac807c6d382c8965329085b321381cc3d (patch) | |
| tree | 0a4a9762120beb250c7d6b378330db32fb93a761 | |
| parent | abb3121308d6317fdcc103ca463dc7c0cb9077dc (diff) | |
| download | gitlab-ce-1d48904ac807c6d382c8965329085b321381cc3d.tar.gz | |
Show avatars in ajax user selectbox
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/selects.scss | 4 | ||||
| -rw-r--r-- | lib/api/entities.rb | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index c1fa16ca89c..ce9a505b1e3 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -1,7 +1,7 @@ $ -> userFormatResult = (user) -> - if user.avatar - avatar = user.avatar.url + if user.avatar_url + avatar = user.avatar_url else if gon.gravatar_enabled avatar = gon.gravatar_url avatar = avatar.replace('%{hash}', md5(user.email)) diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss index c506bff8a74..a257049bacf 100644 --- a/app/assets/stylesheets/generic/selects.scss +++ b/app/assets/stylesheets/generic/selects.scss @@ -78,3 +78,7 @@ select { .project-refs-form .select2-container { margin-right: 10px; } + +.ajax-users-dropdown .select2-search { + padding-top: 4px; +} diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8f54d0d4d84..8557fa074d4 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -6,6 +6,12 @@ module API expose :is_admin?, as: :is_admin expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project + + expose :avatar_url do |user, options| + if user.avatar.present? + user.avatar.url + end + end end class UserSafe < Grape::Entity |