diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index ceb218b7..6a431aa2 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -149,6 +149,15 @@ class UserController < ApplicationController @list = list @list.orders.include_relations(product_orders: :product) h = @list.as_json + + # Handle join requests + if @list.join_requests.any? + h[:join_requests] = [] + for user in CouchPotato.database.load_document(@list.join_requests) + h[:join_requests] << {user_id: user.id, user_email: user.email} + end + end + h[:orders] = [] h[:list_active] = @list.active? list_total = 0.0