Merge pull request #4317 from atif-shaikh/CRM-15379

[civicrm-core.git] / CRM / Admin / Form.php

diff --git a/CRM/Admin/Form.php b/CRM/Admin/Form.php
index 4fcf841f6a7cc77947866de6747dd057c8c320f0..0f6a1d407b0faa4089aff54964b7165d683eb518 100644 (file)
--- a/CRM/Admin/Form.php
+++ b/CRM/Admin/Form.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -59,6 +59,9 @@ class CRM_Admin_Form extends CRM_Core_Form {
    */
   protected $_BAOName;
 
+  /**
+   * Basic setup
+   */
   function preProcess() {
     $this->_id      = $this->get('id');
     $this->_BAOName = $this->get('BAOName');
@@ -72,12 +75,12 @@ class CRM_Admin_Form extends CRM_Core_Form {
   }
 
   /**
-   * This function sets the default values for the form. MobileProvider that in edit/view mode
+   * This function sets the default values for the form. Note that in edit/view mode
    * the default values are retrieved from the database
    *
    * @access public
    *
-   * @return None
+   * @return array
    */
   function setDefaultValues() {
     if (isset($this->_id) && empty($this->_values)) {
@@ -96,29 +99,25 @@ class CRM_Admin_Form extends CRM_Core_Form {
 
     // its ok if there is no element called is_active
     $defaults['is_active'] = ($this->_id) ? CRM_Utils_Array::value('is_active', $defaults) : 1;
-    if (CRM_Utils_Array::value('parent_id', $defaults)) {
+    if (!empty($defaults['parent_id'])) {
       $this->assign('is_parent', TRUE);
     }
     return $defaults;
   }
 
   /**
-   * Function to actually build the form
+   * Add standard buttons
    *
-   * @return None
+   * @return void
    * @access public
    */
   public function buildQuickForm() {
-    if ($this->_action & CRM_Core_Action::DELETE) {
+    if ($this->_action & CRM_Core_Action::VIEW || $this->_action & CRM_Core_Action::PREVIEW) {
       $this->addButtons(array(
-          array(
-            'type' => 'next',
-            'name' => ts('Delete'),
-            'isDefault' => TRUE,
-          ),
           array(
             'type' => 'cancel',
-            'name' => ts('Cancel'),
+            'name' => ts('Done'),
+            'isDefault' => TRUE,
           ),
         )
       );
@@ -127,7 +126,7 @@ class CRM_Admin_Form extends CRM_Core_Form {
       $this->addButtons(array(
           array(
             'type' => 'next',
-            'name' => ts('Save'),
+            'name' => $this->_action & CRM_Core_Action::DELETE ? ts('Delete') : ts('Save'),
             'isDefault' => TRUE,
           ),
           array(