Browse Source

Fixed problem of available datastream list.

pull/105/head
Alexander O'Neill 14 years ago
parent
commit
f92e226703
  1. 2
      CollectionClass.inc
  2. 2
      fedora_repository.module
  3. 2
      formClass.inc

2
CollectionClass.inc

@ -445,7 +445,7 @@ class CollectionClass {
$tabset['my_tabset']['third_tab']['tabset']['view'] = array( $tabset['my_tabset']['third_tab']['tabset']['view'] = array(
'#type' => 'tabpage', '#type' => 'tabpage',
'#title' => t('View'), '#title' => t('View'),
'#content' => $dc_html . $ds_list . drupal_get_form('add_stream_form', $this->pid), '#content' => $dc_html . $ds_list,
); );
if (fedora_repository_access(OBJECTHELPER :: $EDIT_FEDORA_METADATA, $this->pid, $user)) { if (fedora_repository_access(OBJECTHELPER :: $EDIT_FEDORA_METADATA, $this->pid, $user)) {

2
fedora_repository.module

@ -356,7 +356,7 @@ function add_stream_form_validate($form, &$form_state) {
return FALSE; return FALSE;
} }
if (!(preg_match("/^[a-zA-Z]/", $dsid))) { if (!(preg_match("/^[a-zA-Z]/", $dsid))) {
form_set_error('', t('Data stream ID has to start with a letter.')); form_set_error('', t("Data stream ID ($dsid) has to start with a letter."));
return FALSE; return FALSE;
} }
if (strlen($dsLabel) > 64) { if (strlen($dsLabel) > 64) {

2
formClass.inc

@ -704,7 +704,7 @@ class formClass {
'#weight' => '-1', '#weight' => '-1',
'#description' => t('Datastream IDs defined by the content model.'), '#description' => t('Datastream IDs defined by the content model.'),
); );
$form['stream_id']['#options'] = $unused_dsids; $form['stream_id']['#options'] = array_combine($unused_dsids, $unused_dsids);
} }
else { else {
$form['stream_id'] = array( $form['stream_id'] = array(

Loading…
Cancel
Save