Fixed source not being selected in CSV download

boboldehampsink · Dec 10, 2014 · d357223 · d357223
1 parent 425b356
commit d357223
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/controllers/AuditLogController.php b/controllers/AuditLogController.php
@@ -10,6 +10,9 @@ public function actionDownload()
         // Get criteria
         $criteria = craft()->elements->getCriteria('AuditLog', craft()->request->getParam('criteria'));
 
+        // Get element type
+        $elementType = craft()->elements->getElementType('AuditLog');
+
         // Get order and sort
         $viewState = craft()->request->getParam('viewState', array(
             'order' => 'id',
@@ -23,14 +26,15 @@ public function actionDownload()
         $criteria->search = craft()->request->getParam('search');
 
         // Get source
-        $criteria->source = craft()->request->getParam('source', '*');
+        $sources = $elementType->getSources();
+        $source = craft()->request->getParam('source', '*');
 
+        // Set type
+        $criteria->type = $source != '*' ? $sources[$source]['criteria']['type'] : null;
+
         // Get data
         $log = craft()->auditLog->log($criteria);
 
-        // Get element type
-        $elementType = craft()->elements->getElementType('AuditLog');
-
         // Set status attribute
         $attributes['status'] = Craft::t('Status');
 

diff --git a/elementtypes/AuditLogElementType.php b/elementtypes/AuditLogElementType.php
@@ -176,7 +176,7 @@ public function getIndexHtml($criteria, $disabledElementIds, $viewState, $source
 
         } else {
 
-            // Get sortable attribuets
+            // Get sortable attributes
             $sortableAttributes = $this->defineSortableAttributes();
 
             if($sortableAttributes) {