Browse Source

Bypass organisation checks for support users

pull/2646/head
Manny Dinssa 2 years ago
parent
commit
5b6d509908
  1. 12
      app/helpers/filters_helper.rb

12
app/helpers/filters_helper.rb

@ -309,13 +309,21 @@ private
return "All" if session_filters["assigned_to"].include?("all") return "All" if session_filters["assigned_to"].include?("all")
return "You" if session_filters["assigned_to"].include?("you") return "You" if session_filters["assigned_to"].include?("you")
User.own_and_managing_org_users(current_user.organisation).find(session_filters["user"].to_i).name selected_user_option = find_selected_specific_user(session_filters)
selected_user_option = User.own_and_managing_org_users(current_user.organisation).find(session_filters["user"].to_i)
return unless selected_user_option return unless selected_user_option
"#{selected_user_option.name} (#{selected_user_option.email})" "#{selected_user_option.name} (#{selected_user_option.email})"
end end
def find_selected_specific_user(session_filters)
user_id = session_filters["user"].to_i
if current_user.support?
User.find(user_id)
else
User.own_and_managing_org_users(current_user.organisation).find(user_id)
end
end
def formatted_owned_by_filter(session_filters, filter_type) def formatted_owned_by_filter(session_filters, filter_type)
return "All" if params["id"].blank? && (session_filters["owning_organisation"].blank? || session_filters["owning_organisation"]&.include?("all")) return "All" if params["id"].blank? && (session_filters["owning_organisation"].blank? || session_filters["owning_organisation"]&.include?("all"))

Loading…
Cancel
Save