From 8f40ab03b9af2bce94daa51373b5cbc2cebb5825 Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Fri, 1 May 2015 18:40:46 -0400
Subject: [PATCH] Replace Equipment Description field with plain Description
 field (from farm_fields).

---
 farm_equipment.features.field_base.inc     | 19 -------------------
 farm_equipment.features.field_instance.inc |  7 +++----
 farm_equipment.info                        |  3 +--
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/farm_equipment.features.field_base.inc b/farm_equipment.features.field_base.inc
index fd1dceb57..18b76e755 100644
--- a/farm_equipment.features.field_base.inc
+++ b/farm_equipment.features.field_base.inc
@@ -45,24 +45,5 @@ function farm_equipment_field_default_field_bases() {
     'type' => 'entityreference',
   );
 
-  // Exported field_base: 'field_farm_equipment_description'
-  $field_bases['field_farm_equipment_description'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_farm_equipment_description',
-    'indexes' => array(
-      'format' => array(
-        0 => 'format',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'text',
-    'settings' => array(),
-    'translatable' => 0,
-    'type' => 'text_long',
-  );
-
   return $field_bases;
 }
diff --git a/farm_equipment.features.field_instance.inc b/farm_equipment.features.field_instance.inc
index 021ed3e9e..c898c8a4c 100644
--- a/farm_equipment.features.field_instance.inc
+++ b/farm_equipment.features.field_instance.inc
@@ -10,9 +10,8 @@
 function farm_equipment_field_default_field_instances() {
   $field_instances = array();
 
-  // Exported field_instance:
-  // 'farm_asset-equipment-field_farm_equipment_description'
-  $field_instances['farm_asset-equipment-field_farm_equipment_description'] = array(
+  // Exported field_instance: 'farm_asset-equipment-field_farm_description'
+  $field_instances['farm_asset-equipment-field_farm_description'] = array(
     'bundle' => 'equipment',
     'default_value' => NULL,
     'deleted' => 0,
@@ -27,7 +26,7 @@ function farm_equipment_field_default_field_instances() {
       ),
     ),
     'entity_type' => 'farm_asset',
-    'field_name' => 'field_farm_equipment_description',
+    'field_name' => 'field_farm_description',
     'label' => 'Description',
     'required' => 0,
     'settings' => array(
diff --git a/farm_equipment.info b/farm_equipment.info
index 9eb9563bb..11496e4ee 100644
--- a/farm_equipment.info
+++ b/farm_equipment.info
@@ -24,8 +24,7 @@ features[ctools][] = views:views_default:3.0
 features[farm_asset_type][] = equipment
 features[features_api][] = api:2
 features[field_base][] = field_farm_equipment
-features[field_base][] = field_farm_equipment_description
-features[field_instance][] = farm_asset-equipment-field_farm_equipment_description
+features[field_instance][] = farm_asset-equipment-field_farm_description
 features[field_instance][] = farm_asset-equipment-field_farm_files
 features[field_instance][] = farm_asset-equipment-field_farm_images
 features[field_instance][] = log-farm_maintenance-field_farm_equipment