From 4b477a36d105e53f77364d21204a8bb6a28c23e2 Mon Sep 17 00:00:00 2001 From: Kylea Jackson Date: Tue, 7 Apr 2015 14:53:34 -0300 Subject: [PATCH] Fixing derivatives hook spelling error --- includes/delete_datastream.form.inc | 44 +++++------------------------ includes/derivatives.inc | 4 +-- includes/object_properties.form.inc | 2 +- islandora.module | 4 +-- 4 files changed, 12 insertions(+), 42 deletions(-) diff --git a/includes/delete_datastream.form.inc b/includes/delete_datastream.form.inc index b88ef0da..346aeeca 100644 --- a/includes/delete_datastream.form.inc +++ b/includes/delete_datastream.form.inc @@ -19,44 +19,15 @@ * The drupal form definition. */ function islandora_delete_datastream_form(array $form, array &$form_state, AbstractDatastream $datastream) { - // XXX: Stashed version of datastream is deprecated... Use object and - // datastream IDs from 'datastream_info' to acquire. $form_state['datastream'] = $datastream; - - $form_state['datastream_info'] = array( - 'object_id' => $datastream->parent->id, - 'datastream_id' => $datastream->id, - ); $object = $datastream->parent; $dsid = $datastream->id; - $dsids = array_merge(array($dsid), islandora_datastream_to_purge($object, $dsid)); - $dsids = array_unique($dsids); + $derivs = implode(', ', islandora_datastream_to_purge($object, $dsid)); $form['delete_derivatives'] = array( - '#title' => t('Delete Derviatives'), + '#title' => t('Delete Derivatives'), '#type' => 'checkbox', '#default_value' => 0, - '#description' => t('Derivatives can be regenerated at a later time.'), - ); - $form['base_info'] = array( - '#type' => 'item', - '#title' => t('Datastream to be purged'), - '#markup' => $dsid, - '#states' => array( - 'invisible' => array( - ':input[name="delete_derivatives"]' => array('checked' => TRUE), - ), - ), - ); - $form['derivative_info'] = array( - '#type' => 'item', - '#title' => t('Datastream(s) to be purged'), - '#description' => t('Including detectable derivatives.'), - '#markup' => implode(', ', $dsids), - '#states' => array( - 'visible' => array( - ':input[name="delete_derivatives"]' => array('checked' => TRUE), - ), - ), + '#description' => t('Derivatives can be regenerated at a later time.

Datastream(s) to be purged:

@dsid, @derivs', array('@dsid' => $datastream->id, '@derivs' => $derivs)), ); return confirm_form($form, t('Are you sure you want to delete the %dsid datastream?', array('%dsid' => $datastream->id)), @@ -72,7 +43,7 @@ function islandora_delete_datastream_form(array $form, array &$form_state, Abstr */ function islandora_datastream_to_purge(AbstractObject $object, $dsid) { module_load_include('inc', 'islandora', 'includes/utilities'); - $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); + $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object)); $hook_filter = function ($hook_def) use ($dsid) { return isset($hook_def['source_dsid']) && isset($hook_def['destination_dsid']) ? $hook_def['source_dsid'] == $dsid : @@ -116,10 +87,9 @@ function islandora_datastream_derivatives_purged(AbstractObject $object, $dsid) * The Drupal form state. */ function islandora_delete_datastream_form_submit(array $form, array &$form_state) { - $object = islandora_object_load($form_state['datastream_info']['object_id']); - $datastream_id = $form_state['datastream_info']['datastream_id']; - $datastream = $object[$datastream_id]; - + $datastream = $form_state['datastream']; + $datastream_id = $datastream->id; + $object = $datastream->parent; $deleted = FALSE; if ($form_state['values']['delete_derivatives']) { islandora_datastream_derivatives_purged($object, $datastream_id); diff --git a/includes/derivatives.inc b/includes/derivatives.inc index 7248f03f..74ca2f76 100644 --- a/includes/derivatives.inc +++ b/includes/derivatives.inc @@ -83,7 +83,7 @@ function islandora_do_derivatives(AbstractObject $object, array $options) { $options += array( 'force' => FALSE, ); - $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); + $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object)); uasort($hooks, 'drupal_sort_weight'); $results = array(); $hooks = islandora_filter_derivatives($hooks, $options, $object); @@ -176,7 +176,7 @@ function islandora_do_batch_derivatives(AbstractObject $object, array $options) $options += array( 'force' => FALSE, ); - $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); + $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object)); uasort($hooks, 'drupal_sort_weight'); $operations = array(); diff --git a/includes/object_properties.form.inc b/includes/object_properties.form.inc index b8fcef7e..ba975803 100644 --- a/includes/object_properties.form.inc +++ b/includes/object_properties.form.inc @@ -29,7 +29,7 @@ function islandora_object_properties_form(array $form, array &$form_state, Abstr $regenerate_derivatives_access = FALSE; if (islandora_object_access(ISLANDORA_REGENERATE_DERIVATIVES, $object)) { module_load_include('inc', 'islandora', 'includes/derivatives'); - $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); + $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object)); $hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object); if (count($hooks) >= 1) { $regenerate_derivatives_access = TRUE; diff --git a/islandora.module b/islandora.module index cfd045e1..011df6e5 100644 --- a/islandora.module +++ b/islandora.module @@ -58,7 +58,7 @@ define('ISLANDORA_DATASTREAM_INGESTED_HOOK', 'islandora_datastream_ingested'); define('ISLANDORA_DATASTREAM_MODIFIED_HOOK', 'islandora_datastream_modified'); define('ISLANDORA_DATASTREAM_PURGED_HOOK', 'islandora_datastream_purged'); define('ISLANDORA_INGEST_STEP_HOOK', 'islandora_ingest_steps'); -define('ISLANDORA_DERVIATIVE_CREATION_HOOK', 'islandora_derivative'); +define('ISLANDORA_DERIVATIVE_CREATION_HOOK', 'islandora_derivative'); // Autocomplete paths. define('ISLANDORA_CONTENT_MODELS_AUTOCOMPLETE', 'islandora/autocomplete/content-models'); @@ -1946,7 +1946,7 @@ function islandora_islandora_datastream_access($op, AbstractDatastream $datastre module_load_include('inc', 'islandora', 'includes/derivatives'); $applicable_hook = FALSE; $object = $datastream->parent; - $hooks = islandora_invoke_hook_list(ISLANDORA_DERVIATIVE_CREATION_HOOK, $object->models, array($object)); + $hooks = islandora_invoke_hook_list(ISLANDORA_DERIVATIVE_CREATION_HOOK, $object->models, array($object)); $hooks = islandora_filter_derivatives($hooks, array('force' => TRUE), $object); foreach ($hooks as $hook) { if (isset($hook['destination_dsid']) && $hook['destination_dsid'] == $datastream->id &&