From 1981b852f31223227fc1d384111d5cff59db07ea Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 10 Dec 2010 18:32:12 +0100 Subject: fix delete policies after delete/:id and --- application.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'application.rb') diff --git a/application.rb b/application.rb index b522baf..f11a211 100644 --- a/application.rb +++ b/application.rb @@ -59,14 +59,16 @@ delete '/:id/?' do uri = ModelStore.get(params[:id]).uri ModelStore.get(params[:id]).destroy! "Model #{params[:id]} deleted." - if params[:token_id] and !Model.get(params[:id]) and uri + if params[:token_id] and !ModelStore.get(params[:id]) and uri begin - aa = OpenTox::Authorization.delete_policy_from_uri(uri, params[:token_id]) + aa = OpenTox::Authorization.delete_policies_from_uri(uri, params[:token_id]) LOGGER.debug "Policy deleted for Model URI: #{uri} with token_id: #{params[:token_id]} with result: #{aa}" rescue LOGGER.warn "Policy delete error for Model URI: #{uri}" end end + response['Content-Type'] = 'text/plain' + "Model #{params[:id]} deleted." rescue halt 404, "Model #{params[:id]} does not exist." end -- cgit v1.2.3