[Gemstracker-svn] SF.net SVN: gemstracker:[955] trunk/library/classes/Gems

[<gem...@li...>]

Revision: 955
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=955&view=rev
Author:   mennodekker
Date:     2012-09-25 14:30:28 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
Minor optimization for excel export + increased max_execution_time for as long as it is not yet moved to a BatchTask

Modified Paths:
--------------
    trunk/library/classes/Gems/Controller/BrowseEditAction.php
    trunk/library/classes/Gems/FormattedData.php

Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php	2012-09-25 12:26:47 UTC (rev 954)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php	2012-09-25 14:30:28 UTC (rev 955)
@@ -429,6 +429,8 @@
      */
     public function excelAction()
     {
+        ini_set('max_execution_time', 90);  // Quickfix as long as it is not in a batchtask
+
         // Set the request cache to use the search params from the index action
         $this->getCachedRequestData(true, 'index');
 

Modified: trunk/library/classes/Gems/FormattedData.php
===================================================================
--- trunk/library/classes/Gems/FormattedData.php	2012-09-25 12:26:47 UTC (rev 954)
+++ trunk/library/classes/Gems/FormattedData.php	2012-09-25 14:30:28 UTC (rev 955)
@@ -86,7 +86,7 @@
         return $row;
     }
 
-    /**
+     /**
      * This is the actual format function, copied from the Exhibitor for field
      *
      * @param type $name
@@ -95,10 +95,8 @@
      */
     private static function _format($name, $result, $model)
     {
-        if ($default = $model->get($name,'default')) {
-            if (null === $result) {
-                $result = $default;
-            }
+        if (null === $result && $default = $model->get($name,'default')) {
+            $result = $default;
         }
 
         if ($multiOptions = $model->get($name, 'multiOptions')) {
@@ -146,13 +144,11 @@
 
         // If it is Lazy, execute it
         if ($result instanceof MUtil_Lazy_LazyInterface) {
-            if ($result instanceof MUtil_Lazy_LazyInterface) {
-                $result = MUtil_Lazy::rise($result);
-            }
+            $result = MUtil_Lazy::rise($result);
         }
 
         // If it is Html, render it
-        if ($result instanceof MUtil_Html_HtmlInterface || $result instanceof MUtil_Lazy_LazyInterface) {
+        if ($result instanceof MUtil_Html_HtmlInterface) {
 
             $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
             if (null === $viewRenderer->view) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.