Browse Source

Merge pull request #334 from nigelgbanks/7.x-ingest-form

Fix step ordering
pull/338/merge
William Panting 12 years ago
parent
commit
5df969be82
  1. 10
      includes/ingest.form.inc

10
includes/ingest.form.inc

@ -78,6 +78,12 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
if (empty($objects)) { if (empty($objects)) {
$objects[] = islandora_ingest_form_prepare_new_object($configuration); $objects[] = islandora_ingest_form_prepare_new_object($configuration);
} }
// Make sure the models actually exist
foreach ($configuration['models'] as $key => $model) {
if (!islandora_object_load($model)) {
unset($configuration['models'][$key]);
}
}
// No need to persist the 'objects' within the configuration. // No need to persist the 'objects' within the configuration.
unset($configuration['objects']); unset($configuration['objects']);
// Required for step hooks. // Required for step hooks.
@ -534,7 +540,7 @@ function islandora_ingest_form_previous_button(array &$form_state) {
$prev_form_step = islandora_ingest_form_get_previous_form_step($form_state); $prev_form_step = islandora_ingest_form_get_previous_form_step($form_state);
$form_id = $prev_form_step['form_id']; $form_id = $prev_form_step['form_id'];
$submit_callback = $form_id . '_undo_submit'; $submit_callback = $form_id . '_undo_submit';
$submit = function_exists($submit_callback) ? array($submit_callback, 'islandora_ingest_form_previous_submit') : array('islandora_ingest_form_previous_submit'); $submit = function_exists($submit_callback) ? array('islandora_ingest_form_previous_submit', $submit_callback) : array('islandora_ingest_form_previous_submit');
return array( return array(
'#type' => 'submit', '#type' => 'submit',
'#value' => t('Previous'), '#value' => t('Previous'),
@ -731,7 +737,7 @@ function &islandora_ingest_form_get_objects(array &$form_state) {
*/ */
function islandora_ingest_form_get_object(array &$form_state) { function islandora_ingest_form_get_object(array &$form_state) {
$objects = &islandora_ingest_form_get_objects($form_state); $objects = &islandora_ingest_form_get_objects($form_state);
return current($objects); return reset($objects);
} }
/** /**

Loading…
Cancel
Save