diff --git a/CollectionClass.inc b/CollectionClass.inc index 0644d6c2..84d67dae 100644 --- a/CollectionClass.inc +++ b/CollectionClass.inc @@ -430,18 +430,17 @@ class CollectionClass { $tabset['view_tab'] = array( // $collection_fieldset = array ( '#type' => 'tabpage', - '#title' => t('Members'), + '#title' => 'View', '#content' => $collection_items ); $tabset['add_tab'] = array( // #type and #title are the minimum requirements. '#type' => 'tabpage', - '#title' => t('Add / Edit'), + '#title' => t('Add'), '#selected' => $show_ingest_tab, // This will be the content of the tab. '#content' => $add_to_collection, ); - return $tabset; } @@ -464,7 +463,7 @@ class CollectionClass { } } else { - $ingestObject = ' '; + $ingestObject = ''; } return $ingestObject; diff --git a/fedora_repository.module b/fedora_repository.module index 9d65fba3..21f33217 100644 --- a/fedora_repository.module +++ b/fedora_repository.module @@ -236,7 +236,12 @@ function fedora_repository_ingest_form(&$form_state, $collection_pid, $collectio function fedora_repository_purge_object_form(&$form_state, $pid, $referrer = NULL) { global $base_url; - // $form['#redirect'] = "fedora/repository/$collectionPid/"; + if (!user_access('purge objects and datastreams')) { + return NULL; + } + if ($pid == NULL) { + return NULL; + } $form['pid'] = array( '#type' => 'hidden', '#value' => "$pid" diff --git a/formClass.inc b/formClass.inc index cdc5c578..6fe8efe3 100644 --- a/formClass.inc +++ b/formClass.inc @@ -708,7 +708,9 @@ class formClass { '#weight' => '-1', '#description' => t('Datastream IDs defined by the content model.'), ); - $form['stream_id']['#options'] = $dsidsForForm; + + $form['stream_id']['#options'] = array_combine($unused_dsids, $unused_dsids); + } else { $form['stream_id'] = array(