Browse Source

ISLANDORA-214 Fix reference in solution pack form.

pull/105/head
Alexander O'Neill 14 years ago
parent
commit
58bce36473
  1. 23
      fedora_repository.module

23
fedora_repository.module

@ -1781,21 +1781,21 @@ function fedora_repository_solution_packs_page() {
* Check for installed objects and add a 'Update' or 'Install' button if some objects are missing. * Check for installed objects and add a 'Update' or 'Install' button if some objects are missing.
* @param array $solution_pack * @param array $solution_pack
*/ */
function fedora_repository_solution_pack_form($form, $solution_pack_module, $solution_pack_name, $objects = array()) { function fedora_repository_solution_pack_form(&$form_state, $solution_pack_module, $solution_pack_name, $objects = array()) {
// Check each object to see if it is in the repository. // Check each object to see if it is in the repository.
module_load_include('inc', 'fedora_repository', 'api/fedora_item'); module_load_include('inc', 'fedora_repository', 'api/fedora_item');
$form = array();
$form['solution_pack'] = array(
'#type' => 'fieldset',
'#title' => $solution_pack_name,
);
$needs_update = FALSE; $needs_update = FALSE;
$needs_install = FALSE; $needs_install = FALSE;
$form = array();
$form['solution_pack_module'] = array( $form['solution_pack_module'] = array(
'#type' => 'hidden', '#type' => 'hidden',
'#value' => $solution_pack_module, '#value' => $solution_pack_module,
); );
$form['solution_pack']['objects'] = array(
if (!$form_state['submitted']) {
$form['objects'] = array(
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => "Objects", '#title' => "Objects",
'#weight' => 10, '#weight' => 10,
@ -1833,16 +1833,16 @@ function fedora_repository_solution_pack_form($form, $solution_pack_module, $sol
} }
} }
$form['solution_pack']['objects']['table'] = array( $form['objects']['table'] = array(
'#type' => 'markup', '#type' => 'markup',
'#value' => theme_table($table_header, $table_rows), '#value' => theme_table($table_header, $table_rows),
); );
$form['install'] = array( }
'#name' => 'install', $form['submit'] = array(
'#value' => t('Install'), '#value' => t('Install'),
'#disabled' => !$needs_install, '#disabled' => !$needs_install,
'#type' => 'submit', '#type' => 'submit',
'#action' => 'install', '#name' => 'ingest',
); );
return $form; return $form;
@ -1864,7 +1864,6 @@ function fedora_repository_solution_pack_form_submit($form, &$form_state) {
$batch['operations'][] = array('fedora_repository_batch_reingest_object', array($object)); $batch['operations'][] = array('fedora_repository_batch_reingest_object', array($object));
} }
batch_set($batch); batch_set($batch);
batch_process();
} }
function fedora_repository_batch_reingest_object($object, &$context) { function fedora_repository_batch_reingest_object($object, &$context) {

Loading…
Cancel
Save