From 2ef6e45ed4e2ce18863849a06ec9e2e3c376ba38 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Fri, 20 Jul 2012 13:55:04 -0300 Subject: [PATCH 1/2] Return form consistently. --- fedora_repository.module | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora_repository.module b/fedora_repository.module index 04e9f355..1ad76e6e 100644 --- a/fedora_repository.module +++ b/fedora_repository.module @@ -797,8 +797,9 @@ function fedora_repository_edit_qdc_form(&$form_state, $pid, $dsId = NULL) { // There is no custom function, so just load the standard QDC form. $metaDataForm = new formClass(); //currently we only edit the dc metadata. If you defined a custom form with a custom handler you are sol for now. - return $metaDataForm->createMetaDataForm($pid, $dsId, $client, $form_state); + $output = $metaDataForm->createMetaDataForm($pid, $dsId, $client, $form_state); } + return $output; } From b617131261563592fd24ebdf84af597be2118153 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Fri, 20 Jul 2012 13:55:41 -0300 Subject: [PATCH 2/2] ISLANDORA-655 OwnerId being wiped out. Looks like the "modifyObject" SOAP call requires an owner ID... By default, we were providing NULL, which would result in it being blanked out. I've made it so that it grabs the owner ID from the object profile when it is NULL, so that it should be maintained by default. --- api/fedora_item.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/fedora_item.inc b/api/fedora_item.inc index 51870ab5..0c00e175 100644 --- a/api/fedora_item.inc +++ b/api/fedora_item.inc @@ -980,7 +980,9 @@ RDF; $params = array( 'pid' => $this->pid, - 'ownerId' => $ownerId, + 'ownerId' => (($ownerId !== NULL)? //Default to the current owner if none is provided. + $ownerId: + $this->objectProfile->objOwnerId), 'state' => $state, 'label' => $label, 'logMessage' => $logMessage