supplier client sections working with problematic authentication still active
This commit is contained in:
@@ -17,8 +17,8 @@ class List
|
||||
#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_will_change!
|
||||
self.join_request_user_ids |= [requester.id]
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_users 'user_join_request', payload: Users::JoinRequestSerializer.serialize(join_request_for_user(requester), include: %w[list user])
|
||||
end
|
||||
@@ -31,7 +31,7 @@ class List
|
||||
user.active_list_id = self.id
|
||||
add_user(user)
|
||||
user.save
|
||||
self.is_dirty
|
||||
join_request_user_ids_will_change!
|
||||
save and broadcast_users 'join_request_approved', id: "jr-#{user.id}"
|
||||
end
|
||||
end
|
||||
@@ -39,8 +39,8 @@ class List
|
||||
def reject_join_request_for_user!(user_id)
|
||||
user_id = user_id.id if user_id.is_a?(User) # allow model to be passed as argument
|
||||
if join_request_user_ids.include?(user_id)
|
||||
join_request_user_ids_will_change!
|
||||
join_request_user_ids.delete(user_id)
|
||||
self.is_dirty
|
||||
if save
|
||||
# user_id is not part of the list, so should be broadcasted separately
|
||||
broadcast_user user_id, 'join_request_rejected', id: "jr-#{user_id}"
|
||||
|
||||
Reference in New Issue
Block a user