Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Merge pull request #223 from adam-vessey/7.x 

Allow for altering of the configuration in submit handlers.
pull/224/head
Jonathan Green 12 years ago
parent
ddd584ec44 7a7b0fd1ba
commit
8b04ef9b7c
1 changed files with 10 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      includes/ingest.form.inc

19
includes/ingest.form.inc
Unescape View File

@ -88,6 +88,10 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
reset($steps); reset($steps);
$form_state['islandora']['step_id'] = key($steps); $form_state['islandora']['step_id'] = key($steps);
} }
// Stash the current configuration in the step.
$storage = &islandora_ingest_form_get_step_storage($form_state);
$storage['configuration'] = $form_state['islandora']['configuration'];
} }
/** /**
@ -268,7 +272,6 @@ function islandora_ingest_form_next_submit(array $form, array &$form_state) {
function islandora_ingest_form_stash_info(array &$form_state) { function islandora_ingest_form_stash_info(array &$form_state) {
$storage = &islandora_ingest_form_get_step_storage($form_state); $storage = &islandora_ingest_form_get_step_storage($form_state);
$storage['values'] = $form_state['values']; $storage['values'] = $form_state['values'];
$storage['configuration'] = $form_state['islandora']['configuration'];
unset($form_state['values']); unset($form_state['values']);
} }
@ -278,12 +281,9 @@ function islandora_ingest_form_stash_info(array &$form_state) {
function islandora_ingest_form_grab_info(array &$form_state) { function islandora_ingest_form_grab_info(array &$form_state) {
$storage = islandora_ingest_form_get_step_storage($form_state); $storage = islandora_ingest_form_get_step_storage($form_state);
$form_state['values'] = isset($storage['values'])?$storage['values']:array(); $form_state['values'] = isset($storage['values'])?$storage['values']:array();
$form_state['islandora']['configuration'] = array_merge( if (isset($storage['configuration'])) {
$form_state['islandora']['configuration'], $form_state['islandora']['configuration'] = $storage['configuration'];
isset($storage['configuration'])? }
$storage['configuration']:
array()
);
} }
/** /**
@ -341,7 +341,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
* @return array * @return array
* The configuration used to generate the multi-page ingest forms. * The configuration used to generate the multi-page ingest forms.
*/ */
function &islandora_ingest_form_get_configuration(array $form_state) { function &islandora_ingest_form_get_configuration(array &$form_state) {
return $form_state['islandora']['configuration']; return $form_state['islandora']['configuration'];
} }
@ -515,7 +515,8 @@ function &islandora_ingest_get_steps(array &$form_state) {
// Need to pass by ref... But don't really want an alter. // Need to pass by ref... But don't really want an alter.
foreach (module_implements($hook) as $module) { foreach (module_implements($hook) as $module) {
$function = $module . '_' . $hook; $function = $module . '_' . $hook;
$steps = array_merge($steps, (array)$function($form_state)); $module_steps = (array)$function($form_state);
$steps = array_merge($steps, $module_steps);
} }
} }

Write Preview
Loading…
Cancel
Save