Browse Source

Issue 1764344 #6: Fixed; just needed to set default value to take form_state into account

Lacey Sanderson 12 years ago
parent
commit
11f49c4b12
1 changed files with 4 additions and 3 deletions
  1. 4 3
      tripal_bulk_loader/tripal_bulk_loader.admin.templates.inc

+ 4 - 3
tripal_bulk_loader/tripal_bulk_loader.admin.templates.inc

@@ -1366,6 +1366,7 @@ function tripal_bulk_loader_add_template_field_form(&$form_state = NULL) {
   $form['add_fields']['additional']['required'] = array(
     '#type' => 'checkbox',
     '#title' => 'Make this field required',
+    '#default_value' => (!empty($form_state['values']['required'])) ? $form_state['values']['required'] : $template_field['required'],
   );
 
   $form['add_fields']['additional']['regex_transform'] = array(
@@ -1649,8 +1650,8 @@ function tripal_bulk_loader_add_template_field_form_submit($form, &$form_state)
       }
 
       // sort new regex arrays
-      asort($new_regex['pattern']);
-      asort($new_regex['replace']);
+      ksort($new_regex['pattern']);
+      ksort($new_regex['replace']);
 
       $form_state['storage']['regex'] = $new_regex;
     }
@@ -2101,7 +2102,7 @@ function tripal_bulk_loader_edit_template_field_form(&$form_state = NULL) {
   $form['edit_fields']['additional']['required'] = array(
     '#type' => 'checkbox',
     '#title' => 'Make this field required',
-    '#default_value' => $template_field['required'],
+    '#default_value' => (!empty($form_state['values']['required'])) ? $form_state['values']['required'] : $template_field['required'],
   );
 
   $form['edit_fields']['additional']['regex_transform'] = array(