diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 18:09:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-17 18:09:28 +0300 |
commit | 6535cf9c79362862c31ea7d26c61541b84db18d9 (patch) | |
tree | 6d646edcf11d38e8ac23bceed1340ff8907b850d /app/helpers | |
parent | 9a8f801d7352b7965fe690a599410fb50005ce67 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/page_layout_helper.rb | 11 | ||||
-rw-r--r-- | app/helpers/profiles_helper.rb | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index e39dfa44d86..e3d82e7a091 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -158,6 +158,17 @@ module PageLayoutHelper end end + def user_status_properties(user) + default_properties = { current_emoji: '', current_message: '', can_set_user_availability: Feature.enabled?(:set_user_availability_status, user), default_emoji: UserStatus::DEFAULT_EMOJI } + return default_properties unless user&.status + + default_properties.merge({ + current_emoji: user.status.emoji.to_s, + current_message: user.status.message.to_s, + current_availability: user.status.availability.to_s + }) + end + private def generic_canonical_url diff --git a/app/helpers/profiles_helper.rb b/app/helpers/profiles_helper.rb index 5a42e581867..04a3b915493 100644 --- a/app/helpers/profiles_helper.rb +++ b/app/helpers/profiles_helper.rb @@ -29,4 +29,18 @@ module ProfilesHelper def user_profile? params[:controller] == 'users' end + + def availability_values + Types::AvailabilityEnum.enum + end + + def user_status_set_to_busy?(status) + status&.availability == availability_values[:busy] + end + + def show_status_emoji?(status) + return false unless status + + status.message.present? || status.emoji != UserStatus::DEFAULT_EMOJI + end end |