Fixed a merge conflict

tripal/includes/TripalField.inc

@@ -620,9 +620,20 @@ class TripalField {
 //       '#tree' => TRUE,
 //     );
 
+    $element['#field'] = $field;
+    $element['#instance'] = $instance;
+    $element['#validate'][] = "[module_name]_field_settings_form_validate";
 
     return $element;
   }
+  /**
+   *
+   * @param unknown $form
+   * @param unknown $form_state
+   */
+  public static function settingsFormValidate($form, &$form_state) {
+
+  }
 
   /**
    * Describes this fields "data tables" to Views.

tripal_chado/includes/fields/chado_linker__relationship.inc

@@ -10,7 +10,9 @@ class chado_linker__relationship extends TripalField {
       'description' => t('Relationships between records.'),
       'default_widget' => 'chado_linker__relationship_widget',
       'default_formatter' => 'chado_linker__relationship_formatter',
-      'settings' => array(),
+      'settings' => array(
+        # Put settings here that Drupal will save automatically.
+      ),
       'storage' => array(
         'type' => 'field_chado_storage',
         'module' => 'tripal_chado',
@@ -18,6 +20,7 @@ class chado_linker__relationship extends TripalField {
       ),
     );
   }
+
   /**
    * @see TripalField::can_attach()
    */
@@ -850,12 +853,15 @@ class chado_linker__relationship extends TripalField {
 
     return $verb;
   }
-  
+
+  /**
+   *
+   * @param unknown $field
+   * @param unknown $instance
+   * @param unknown $has_data
+   */
   public static function settingsForm($field, $instance, $has_data) {
-  
-    $settings = $field['settings'];
-  
-    $element = array();
+    $element = parent::settingsForm($field, $instance, $has_data);
     $element['instructions'] = array(
       '#type' => 'item',
       '#markup' => 'You may provide a list of terms that will be available in a select box
@@ -868,14 +874,24 @@ class chado_linker__relationship extends TripalField {
       '#type' => 'textarea',
       '#title' => 'Relationship Types',
       '#description' => 'Provide terms separated by a new line',
-      '#default_value' => $terms,
+      '#default_value' => $terms,
     );
   
     // Add in the semantic web fields.
     $parent_elements = parent::settingsForm($field, $instance, $has_data);
     $element = array_merge($element, $parent_elements);
-  dpm($instance);
+
     return $element;
+
+  }
+  /**
+   *
+   * @param unknown $field
+   * @param unknown $instance
+   * @param unknown $has_data
+   */
+  public static function settingsFormValidate($form, &$form_state) {
+
   }
 }
 

tripal_chado/includes/tripal_chado.fields.inc

@@ -530,6 +530,24 @@ function tripal_chado_field_settings_form($field, $instance, $has_data) {
   }
   return $form;
 }
+
+/**
+ * Implements hook_field_settings_form_validate().
+ *
+ * This is not an actual Drpual hook, but rather a Tripal created hook
+ * to alow the TripalField objects to have a settingsFormValidate() member
+ * function.
+ */
+function tripal_chado_field_settings_form_valiate($form, &$form_state) {
+  $field = $form['#field'];
+  $instance = $form['#instance'];
+  $field_type = $field['type'];
+  module_load_include('inc', 'tripal_chado', 'includes/fields/' . $field_type);
+  if (class_exists($field_type)) {
+    $form = $field_type::settingsFormValidate($field, $instance, $form, $form_state);
+  }
+}
+
 /**
  * Implements hook_field_formatter_settings_summary().
  */