Merge branch '6.x' of git://github.com/Islandora/islandora into 6.x

fedora_repository.module

@@ -1027,6 +1027,9 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
   
 // Add a 'manage object' tab for all objects, where detailed list of content is shown.
   $obj = new FedoraObjectDetailedContent($pid);
+  
+  //can disable showing the object details tab in admin UI
+  if (variable_get('fedora_repository_show_object_details_tab', TRUE)) {
    $object_details = $obj->showFieldSets();
    if ($object_details['fedora_object_details']['#selected'] == TRUE) {
      foreach ($cmodels_tabs as &$cmodel_tab) {
@@ -1035,6 +1038,10 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
        }
      }
    }
+  }
+  else {
+   $object_details = array();
+  }
 
   $hook_tabs = module_invoke_all('islandora_tabs', $content_models, $pid);
   $cmodels_tabs = array_merge($cmodels_tabs, $object_details, $hook_tabs);

formClass.inc

@@ -301,6 +301,22 @@ class formClass {
       '#default_value' => variable_get('fedora_repository_title', 'Digital Repository'),
       '#description' => t('The title displayed when viewing collections and objects in  /fedora/repository. Leave blank to display no title. Note that the menus must be rebuilt after changing this variable.'),
     );
+    //have tabs options (like disable)
+    $form['tabs'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Tabs Configuration'),
+      '#description' => t('Configure the tabs avaialble when viewing Fedora objects.'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    //when checked show object details tab
+    $form['tabs']['fedora_repository_show_object_details_tab'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Show Object Details Tab'),
+      '#default_value' => variable_get('fedora_repository_show_object_details_tab', TRUE),
+      '#description' => t("When enabled, the 'Object Details' tab will be visible to users with the correct permissions when viewing an object in the repository"),
+    );
+    
     $form['advanced'] = array(
       '#type' => 'fieldset',
       '#title' => t('Advanced configuration options'),