Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Api] Improve error handling on destroy action #14098

Merged
merged 3 commits into from
Mar 2, 2017
Merged

[Api] Improve error handling on destroy action #14098

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a0cd0
Refactor: Move logging and RBAC check closer to the actual action
isimluk Feb 28, 2017
0a88102
Avoid double selects in row
isimluk Feb 28, 2017
d3d5dcd
Improve usability of delete action - publish reason to the user
isimluk Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/controllers/api/base_controller/generic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ def delete_resource(type, id = nil, _data = nil)
klass = collection_class(type)
id ||= @req.c_id
raise BadRequestError, "Must specify an id for deleting a #{type} resource" unless id
api_log_info("Deleting #{type} id #{id}")
resource_search(id, type, klass)
delete_resource_action(klass, type, id)
end

Expand Down Expand Up @@ -184,11 +182,13 @@ def add_subcollection_data_to_resource(resource, type, subcollection_data)
end

def delete_resource_action(klass, type, id)
api_log_info("Deleting #{type} id #{id}")
resource = resource_search(id, type, klass)
result = begin
klass.destroy(id)
resource.destroy!
action_result(true, "#{type} id: #{id} deleting")
rescue => err
action_result(false, err.to_s)
action_result(false, "#{err} - #{resource.errors.full_messages.join(', ')}")
end
add_href_to_result(result, type, id)
log_result(result)
Expand Down