Browse Source

white screen fix when no form association exsits on ingest

pull/270/head
Nelson Hart 12 years ago
parent
commit
871262c78f
  1. 6
      ContentModel.inc
  2. 3
      formClass.inc

6
ContentModel.inc

@ -1065,7 +1065,7 @@ class ContentModel extends XMLDatastream {
if (strtolower($ingest_form->getAttribute('hide_file_chooser')) == 'TRUE') { if (strtolower($ingest_form->getAttribute('hide_file_chooser')) == 'TRUE') {
$form['indicator']['ingest-file-location']['#type'] = 'hidden'; $form['indicator']['ingest-file-location']['#type'] = 'hidden';
} }
}
$dsid = $ingest_form->getAttribute('dsid'); $dsid = $ingest_form->getAttribute('dsid');
$method = $ingest_form->getElementsByTagName('form_builder_method')->item(0); $method = $ingest_form->getElementsByTagName('form_builder_method')->item(0);
@ -1093,6 +1093,10 @@ class ContentModel extends XMLDatastream {
} }
} }
} }
else {
self::$errors[] = 'No XML form association exists.';
}
}
return $ret; return $ret;
} }

3
formClass.inc

@ -588,6 +588,7 @@ class formClass {
drupal_set_message($error, 'error'); drupal_set_message($error, 'error');
} }
} }
else {
$form['collection_pid'] = array( $form['collection_pid'] = array(
'#type' => 'hidden', '#type' => 'hidden',
'#value' => $collection_pid '#value' => $collection_pid
@ -598,6 +599,8 @@ class formClass {
'#value' => t('Ingest') '#value' => t('Ingest')
); );
} }
}
return $form; return $form;
} }

Loading…
Cancel
Save