User ember progress
This commit is contained in:
+12
-9
@@ -210,7 +210,7 @@ class List
|
||||
user.save
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_user user.id, 'join_request_approved'
|
||||
broadcast_user user.id, 'join_request_approved', UserUserSerializer.new(user).as_json
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -230,19 +230,26 @@ class List
|
||||
self.join_request_user_ids << requester.id
|
||||
self.is_dirty
|
||||
if save
|
||||
for user in users
|
||||
broadcast_user user.id, 'user_join_request', list_id: id, user_email: requester.email, user_id: requester.id
|
||||
end
|
||||
broadcast_users 'user_join_request', JoinRequestSerializer.new(join_request_for_user(requester)).as_json
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def join_request_for_user(user)
|
||||
JoinRequest.new(user: user, list: self)
|
||||
end
|
||||
|
||||
|
||||
def join_requests
|
||||
@join_requests ||= join_request_user_ids.any? ? self.class.database.load_document(join_request_user_ids).map{|user| join_request_for_user(user) } : []
|
||||
end
|
||||
|
||||
def reject_join_request_for_user!(user_id)
|
||||
if join_request_user_ids.include?(user_id)
|
||||
join_request_user_ids.delete(user_id)
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_user user_id, 'join_request_rejected'
|
||||
broadcast_user user_id, 'join_request_rejected', id: "jr-#{user_id}"
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -380,10 +387,6 @@ class List
|
||||
@join_requests_as_json = h
|
||||
end
|
||||
|
||||
def join_requests
|
||||
@join_requests ||= join_request_user_ids.any? ? self.class.database.load_document(join_request_user_ids).map{|user| JoinRequest.new(user: user, list: self) } : []
|
||||
end
|
||||
|
||||
def product_categories
|
||||
supplier.product_categories
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user