changes
This commit is contained in:
@@ -6,7 +6,7 @@ class List
|
||||
end
|
||||
|
||||
def join_request_for_user(user)
|
||||
JoinRequest.new(user: user, list: self)
|
||||
JoinRequest.new(user: user, list: self, created_at: created_at, updated_at: updated_at)
|
||||
end
|
||||
|
||||
def join_requests
|
||||
@@ -14,12 +14,13 @@ class List
|
||||
end
|
||||
|
||||
def send_table_join_request_for_user!(requester)
|
||||
unless join_request_user_ids.include?(requester.id) or user_ids.include?(requester.id)
|
||||
#unless join_request_user_ids.include?(requester.id) or user_ids.include?(requester.id) # do not resend
|
||||
unless user_ids.include?(requester.id) # resend for the sake of it for now
|
||||
@join_requests = nil # bust cache
|
||||
self.join_request_user_ids << requester.id
|
||||
self.join_request_user_ids |= [requester.id]
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_users 'user_join_request', JoinRequestSerializer.new(join_request_for_user(requester)).as_json
|
||||
broadcast_users 'user_join_request', payload: JSONAPI::Serializer.serialize( join_request_for_user(requester), serializer: Users::JoinRequestSerializer, include: %w[list user])
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -31,7 +32,7 @@ class List
|
||||
add_user(user)
|
||||
user.save
|
||||
self.is_dirty
|
||||
save and broadcast_users 'join_request_approved', UserUserSerializer.new(user).as_json
|
||||
save and broadcast_users 'join_request_approved', id: "jr-#{user.id}"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user