From 6275e1d88ace02678eed67c8b58aa3a067540af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Thu, 24 Jun 2010 18:59:46 +0200 Subject: [PATCH 1/2] feature #200: Removed unused tag --- src/rm/RequestManagerImagePublish.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/rm/RequestManagerImagePublish.cc b/src/rm/RequestManagerImagePublish.cc index 4e293c390b..44f38cb26c 100644 --- a/src/rm/RequestManagerImagePublish.cc +++ b/src/rm/RequestManagerImagePublish.cc @@ -97,10 +97,6 @@ error_authorization: oss << "[ImagePublish] User not authorized to publish/unpublish image" << ", aborting call."; goto error_common; - -error_remove_attribute: - oss << "[ImagePublish] Cannot publish/unpublish image [" << iid << "]"; - goto error_common; error_common: arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE From a82b9d1a159ac4e29cb1f6ca94777cf44ec083f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Thu, 24 Jun 2010 19:20:18 +0200 Subject: [PATCH 2/2] feature #200: Some fixes for Image RM --- src/rm/RequestManagerImageEnable.cc | 4 +++- src/rm/RequestManagerImagePublish.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rm/RequestManagerImageEnable.cc b/src/rm/RequestManagerImageEnable.cc index 3db5a4b89e..04a30316ff 100644 --- a/src/rm/RequestManagerImageEnable.cc +++ b/src/rm/RequestManagerImageEnable.cc @@ -45,7 +45,7 @@ void RequestManager::ImageEnable::execute( session = xmlrpc_c::value_string (paramList.getString(0)); iid = xmlrpc_c::value_int (paramList.getInt(1)); - enable_flag = xmlrpc_c::value_boolean(paramList.getBoolean(1)); + enable_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2)); // First, we need to authenticate the user rc = ImageEnable::upool->authenticate(session); @@ -78,6 +78,8 @@ void RequestManager::ImageEnable::execute( } + ImageEnable::ipool->update(image); + image->unlock(); arrayData.push_back(xmlrpc_c::value_boolean(true)); diff --git a/src/rm/RequestManagerImagePublish.cc b/src/rm/RequestManagerImagePublish.cc index 44f38cb26c..75c7b62108 100644 --- a/src/rm/RequestManagerImagePublish.cc +++ b/src/rm/RequestManagerImagePublish.cc @@ -45,7 +45,7 @@ void RequestManager::ImagePublish::execute( session = xmlrpc_c::value_string (paramList.getString(0)); iid = xmlrpc_c::value_int (paramList.getInt(1)); - publish_flag = xmlrpc_c::value_boolean(paramList.getBoolean(1)); + publish_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2)); // First, we need to authenticate the user rc = ImagePublish::upool->authenticate(session); @@ -71,6 +71,8 @@ void RequestManager::ImagePublish::execute( } image->publish(publish_flag); + + ImagePublish::ipool->update(image); image->unlock();