Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

[civicrm-core.git] / CRM / Case / Form / Report.php

diff --git a/CRM/Case/Form/Report.php b/CRM/Case/Form/Report.php
index 66e48a55896b18894945594fa346bcfb8c31daad..34847d8d12050813cc4fb82e7bb2c348dbde7d96 100644 (file)
--- a/CRM/Case/Form/Report.php
+++ b/CRM/Case/Form/Report.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,7 +59,7 @@ class CRM_Case_Form_Report extends CRM_Core_Form {
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @access public
    */ function preProcess() {
     $this->_caseID = CRM_Utils_Request::retrieve('caseid', 'Integer', $this, TRUE);
@@ -105,7 +105,6 @@ class CRM_Case_Form_Report extends CRM_Core_Form {
         array(
           'type' => 'refresh',
           'name' => ts('Generate Report'),
-          'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),
         array(
@@ -114,6 +113,8 @@ class CRM_Case_Form_Report extends CRM_Core_Form {
         ),
       )
     );
+    // We want this form to redirect to a full page
+    $this->preventAjaxSubmit();
   }
 
   /**
@@ -121,7 +122,7 @@ class CRM_Case_Form_Report extends CRM_Core_Form {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   public function postProcess() {
     // store the submitted values in an array