Merge branch 'ISLANDORA-171' of github.com:Islandora/islandora into ISLANDORA-171

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;

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"

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(