diff --git a/app/controllers/api/base_controller/generic.rb b/app/controllers/api/base_controller/generic.rb index 2234a541d3a..16122eb5c6f 100644 --- a/app/controllers/api/base_controller/generic.rb +++ b/app/controllers/api/base_controller/generic.rb @@ -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 @@ -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)