Fixed broken CSV export

2 files changed, 21 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 20ffbca1..0277af69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Improvements:
 
 * Make embedded documentation available in multiple languages
 
+Bug fixes:
+
+* Fixed broken CSV exports
+
 Version 1.0.30
 --------------
 
diff --git a/app/Controller/ExportController.php b/app/Controller/ExportController.php
index b2fe0ebd..27046c76 100644
--- a/app/Controller/ExportController.php
+++ b/app/Controller/ExportController.php
@@ -31,22 +31,23 @@ class ExportController extends BaseController
             $data = $this->$model->$method($project['id'], $from, $to);
             $this->response->withFileDownload($filename.'.csv');
             $this->response->csv($data);
-        }
+        } else {
 
-        $this->response->html($this->helper->layout->project('export/'.$action, array(
-            'values' => array(
-                'controller' => 'ExportController',
-                'action' => $action,
-                'project_id' => $project['id'],
-                'from' => $from,
-                'to' => $to,
-            ),
-            'errors' => array(),
-            'date_format' => $this->configModel->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
-            'project' => $project,
-            'title' => $page_title,
-        ), 'export/sidebar'));
+            $this->response->html($this->helper->layout->project('export/'.$action, array(
+                'values' => array(
+                    'controller' => 'ExportController',
+                    'action' => $action,
+                    'project_id' => $project['id'],
+                    'from' => $from,
+                    'to' => $to,
+                ),
+                'errors' => array(),
+                'date_format' => $this->configModel->get('application_date_format'),
+                'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
+                'project' => $project,
+                'title' => $page_title,
+            ), 'export/sidebar'));
+        }
     }
 
     /**
@@ -76,7 +77,7 @@ class ExportController extends BaseController
      */
     public function summary()
     {
-        $this->common('projectDailyColumnStats', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export'));
+        $this->common('projectDailyColumnStatsModel', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export'));
     }
 
     /**