Fix icon for export done button

[civicrm-core.git] / CRM / Export / Form / Map.php

diff --git a/CRM/Export/Form/Map.php b/CRM/Export/Form/Map.php
index d168ab6d3858db417ddfda0161e3ece0890e436f..76a1310a00d58d7ec60c5c0aacf985908f4f76f1 100644 (file)
--- a/CRM/Export/Form/Map.php
+++ b/CRM/Export/Form/Map.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -60,20 +60,28 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
   protected $_mappingId;
 
   /**
-   * Build the form object
+   * Build the form object.
    *
    * @return void
    */
   public function preProcess() {
     $this->_exportColumnCount = $this->get('exportColumnCount');
+    $this->_mappingId = $this->get('mappingId');
+
     if (!$this->_exportColumnCount) {
-      $this->_exportColumnCount = 10;
+      // Set default from saved mapping
+      if ($this->_mappingId) {
+        $mapping = new CRM_Core_DAO_MappingField();
+        $mapping->mapping_id = $this->_mappingId;
+        $this->_exportColumnCount = $mapping->count();
+      }
+      else {
+        $this->_exportColumnCount = 10;
+      }
     }
     else {
-      $this->_exportColumnCount = $this->_exportColumnCount + 10;
+      $this->_exportColumnCount += 10;
     }
-
-    $this->_mappingId = $this->get('mappingId');
   }
 
   public function buildQuickForm() {
@@ -97,6 +105,7 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
         ),
         array(
           'type' => 'done',
+          'icon' => 'close',
           'name' => ts('Done'),
         ),
       )
@@ -104,7 +113,7 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
   }
 
   /**
-   * Global validation rules for the form
+   * Global validation rules for the form.
    *
    * @param array $fields
    *   Posted values of the form.
@@ -143,7 +152,7 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
   }
 
   /**
-   * Process the uploaded file
+   * Process the uploaded file.
    *
    * @return void
    */