From 2cd4ca5eeb979c883f2e5aa94b80f153369d69b6 Mon Sep 17 00:00:00 2001 From: jonathangreen Date: Wed, 30 May 2012 13:40:07 -0300 Subject: [PATCH] Updated collection manager. --- .../includes/ChangeContentModels.inc | 2 +- .../includes/ChildCollection.inc | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/islandora_basic_collection/includes/ChangeContentModels.inc b/islandora_basic_collection/includes/ChangeContentModels.inc index b1f956da..4448c57b 100644 --- a/islandora_basic_collection/includes/ChangeContentModels.inc +++ b/islandora_basic_collection/includes/ChangeContentModels.inc @@ -28,7 +28,7 @@ function islandora_change_content_models_form($form, &$form_state, $collection_p $collection_policy_datastream = $collection_object->getDatastream($collection_policy_dsid); $supported_collection_models = array(); - if ($collection_policy_datastream->content) { + if ($collection_policy_datastream && $collection_policy_datastream->content) { $collection_policy = new CollectionPolicy($collection_policy_datastream->content); $supported_collection_models = $collection_policy->getContentModels(); } diff --git a/islandora_basic_collection/includes/ChildCollection.inc b/islandora_basic_collection/includes/ChildCollection.inc index 682004dc..12382cfa 100644 --- a/islandora_basic_collection/includes/ChildCollection.inc +++ b/islandora_basic_collection/includes/ChildCollection.inc @@ -86,18 +86,15 @@ function islandora_create_child_collection_form_validate($form, &$form_state) { } function islandora_create_child_collection_form_submit($form, &$form_state) { - global $base_root; + global $base_url; module_load_include('inc', 'islandora', '/includes/islandora.ingest'); - $thumbnail = $base_root . '/' . drupal_get_path('module', 'islandora_basic_collection') . '/Crystal_Clear_filesystem_folder_grey.png'; + $thumbnail = $base_url . '/' . drupal_get_path('module', 'islandora_basic_collection') . '/Crystal_Clear_filesystem_folder_grey.png'; $new_collection_pid = $form_state['values']['new_collection_pid']; $new_collection_label = $form_state['values']['collection_name']; $namespace = $form_state['values']['collection_namespace']; // $all_cModels = get_content_models_as_option_array(); - $content_models = array('islandora:collectionCModel'); - $relationship = array( - 'uri' => FEDORA_RELS_EXT_URI, - 'value' => 'isMemberOfCollection', - ); + $content_models = array(array('pid' => 'islandora:collectionCModel')); + $relationship = 'isMemberOfCollection'; $fedora_object = islandora_ingest_get_object($content_models, $form_state['values']['current'], $relationship, $new_collection_pid); $fedora_object->label = $new_collection_label;