Merge remote-tracking branch 'origin/7.x' into 7.x-avoid-chunking-race-condition

README.md

@@ -61,7 +61,6 @@ Having problems or solved a problem? Check out the Islandora google groups for a
 
 Current maintainers:
 
-* [Jordan Dukart](https://github.com/jordandukart)
 * [Diego Pino](https://github.com/DiegoPino)
 
 ## Development

islandora.module

@@ -459,7 +459,8 @@ function islandora_theme() {
       'variables' => array(
         'object' => NULL,
         'content' => NULL,
-        'islandora_content' => NULL),
+        'islandora_content' => NULL,
+      ),
     ),
     // Render a bunch of objects as either a grid or a list.
     'islandora_objects' => array(
@@ -562,6 +563,12 @@ function islandora_theme() {
       'file' => 'includes/solution_packs.inc',
       'render element' => 'form',
     ),
+    // Overview for manage tab.
+    'islandora_object_overview' => array(
+      'file' => 'theme/theme.inc',
+      'template' => 'theme/islandora-object-overview',
+      'variables' => array('islandora_object' => NULL),
+    ),
   );
 }
 
@@ -919,40 +926,21 @@ function islandora_object_manage_access_callback($perms, $object = NULL) {
  */
 function islandora_manage_overview_object(AbstractObject $object) {
   module_load_include('inc', 'islandora', 'includes/utilities');
-  $output = array();
+  $output = islandora_create_manage_overview($object);
   $hooks = islandora_build_hook_list(ISLANDORA_OVERVIEW_HOOK, $object->models);
   foreach ($hooks as $hook) {
     $temp = module_invoke_all($hook, $object);
     islandora_as_renderable_array($temp);
     if (!empty($temp)) {
+      arsort($temp);
       $output = array_merge_recursive($output, $temp);
     }
   }
-  if (empty($output)) {
-    // Add in the default, if we did not get any results.
-    $output = islandora_default_islandora_manage_overview_object($object);
-  }
-  arsort($output);
   drupal_alter($hooks, $object, $output);
   islandora_as_renderable_array($output);
   return $output;
 }
 
-/**
- * Renders the default manage object page for the given object.
- *
- * @param AbstractObject $object
- *   The object used to render the manage object page.
- *
- * @return array
- *   The default rendering of the object manage page, indexed at
- *   'Default Edit output'.
- */
-function islandora_default_islandora_manage_overview_object(AbstractObject $object) {
-  $output = theme('islandora_default_overview', array('islandora_object' => $object));
-  return array('Default overview output' => array('#markup' => $output));
-}
-
 /**
  * Renders the given objects manage page.
  *
@@ -1730,9 +1718,9 @@ function islandora_datastream_access($op, $datastream, $user = NULL) {
     // The datastream check returned FALSE, and one in the object or datastream
     // checks returned TRUE.
     $cache[$op][$datastream->parent->id][$datastream->id][$user->uid] = (
-        !in_array(FALSE, $datastream_results, TRUE) &&
-        (in_array(TRUE, $object_results, TRUE) || in_array(TRUE, $datastream_results, TRUE))
-        );
+      !in_array(FALSE, $datastream_results, TRUE) &&
+      (in_array(TRUE, $object_results, TRUE) || in_array(TRUE, $datastream_results, TRUE))
+    );
   }
 
   return $cache[$op][$datastream->parent->id][$datastream->id][$user->uid];
@@ -1819,7 +1807,6 @@ function islandora_islandora_object_purged($pid) {
   islandora_conditionally_clear_cache();
 }
 
-
 /**
  * Implements hook_islandora_datastream_purged().
  */
@@ -2170,3 +2157,17 @@ function islandora_islandora_get_breadcrumb_query_predicates(AbstractObject $obj
     'fedora-rels-ext:isMemberOf',
   );
 }
+
+/**
+ * Provides information for the object manage page.
+ *
+ * @param AbstractObject $object
+ *   The object being managed.
+ *
+ * @return array
+ *   themed output
+ */
+function islandora_create_manage_overview(AbstractObject $object) {
+  $output = theme('islandora_object_overview', array('islandora_object' => $object));
+  return array('cmodels' => $output);
+}

theme/islandora-object-overview.tpl.php

@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @file
+ * The default islandora object overview.
+ */
+?>
+<div class="islandora-object-overview">
+    <p class = 'islandora_overview_header'><?php print $header; ?></p>
+    <p class = 'islandora_overview_list'><?php print $list; ?></p>
+</div>

theme/theme.inc

@@ -646,4 +646,30 @@ function islandora_preprocess_islandora_dublin_core_description(array &$variable
     }
   }
   $variables['dc_array'] = isset($dc_object) ? $dc_object->asArray() : array();
+  if (isset($variables['dc_array']['dc:description']['value'])) {
+    $variables['dc_array']['dc:description']['value'] = nl2br(filter_xss($variables['dc_array']['dc:description']['value']));
+  }
+}
+
+/**
+ * Implements hook_preprocess().
+ */
+function islandora_preprocess_islandora_object_overview(array &$variables) {
+  $object = $variables['islandora_object'];
+  $cmodels = $object->models;
+  $links = array();
+  foreach ($cmodels as $cmodel) {
+    if ($cmodel != 'fedora-system:FedoraObject-3.0') {
+      $o = islandora_object_load($cmodel);
+      if (is_object($o)) {
+        $links[] = array(l($o->label, "islandora/object/{$o->id}"));
+      }
+      else {
+        $links[] = array(t("@cmodel  - (This content model is not in this Islandora repository.)", array('@cmodel' => $cmodel)));
+      }
+    }
+  }
+  $pluralized_identifier = format_plural(count($links), 'Islandora content model', 'Islandora content models');
+  $variables['header'] = t("This object's behavior is defined by the @identifier", array("@identifier" => $pluralized_identifier));
+  $variables['list'] = theme('item_list', array('items' => $links));
 }