diff --git a/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue index 7b28598..7b9dd04 100755 --- a/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue +++ b/app/javascript/dashboard/routes/dashboard/captain/assistants/inboxes/Index.vue @@ -36,7 +36,9 @@ const handleCreate = () => { nextTick(() => connectInboxDialog.value.dialogRef.open()); }; const handleAction = ({ action, id }) => { - selectedInbox.value = captainInboxes.value.find(inbox => id === inbox.id); + selectedInbox.value = captainInboxes.value.find( + inbox => id === inbox.captain_inbox.id + ); nextTick(() => { if (action === 'delete') { handleDelete(); @@ -77,7 +79,7 @@ onMounted(() =>
:entity="selectedInbox" :delete-payload="{ assistantId: assistantId, - inboxId: selectedInbox.id, + inboxId: selectedInbox.captain_inbox.id, }" type="Inboxes" /> diff --git a/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb index 8310949..f8d5b00 100755 --- a/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb +++ b/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb @@ -18,12 +18,12 @@ class Api::V1::Accounts::Captain::InboxesController < Api::V1::Accounts::BaseCon end def update - @captain_inbox = @assistant.captain_inboxes.find_by!(inbox_id: permitted_params[:inbox_id]) + @captain_inbox = @assistant.captain_inboxes.find(permitted_params[:id]) @captain_inbox.update!(update_params) end def destroy - @captain_inbox = @assistant.captain_inboxes.find_by!(inbox_id: permitted_params[:inbox_id]) + @captain_inbox = @assistant.captain_inboxes.find(permitted_params[:id]) @captain_inbox.destroy! head :no_content end