TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CSV Formatter in services and fix bug on diplaying export and imports

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
This commit is contained in:
Benjamin Perche
2014-07-21 11:37:20 +02:00
parent 27a32e64e6
commit 4e29830bde
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -175,5 +175,9 @@
<service id="thelia.formatter.json_formatter" class="Thelia\Core\FileFormat\Formatting\Formatter\JsonFormatter"> <service id="thelia.formatter.json_formatter" class="Thelia\Core\FileFormat\Formatting\Formatter\JsonFormatter">
<tag name="thelia.formatter" /> <tag name="thelia.formatter" />
</service> </service>
<service id="thelia.formatter.csv_formatter" class="Thelia\Core\FileFormat\Formatting\Formatter\CSVFormatter">
<tag name="thelia.formatter" />
</service>
</services> </services>
</config> </config>

2
core/lib/Thelia/Controller/Admin/ExportController.php
View File

@@ -261,7 +261,7 @@ class ExportController extends BaseAdminController
$loop = new ExportLoop($this->container); $loop = new ExportLoop($this->container);
$loop->initializeArgs([ $loop->initializeArgs([
"export" => $export->getId() "id" => $export->getId()
]); ]);
$query = $loop->buildModelCriteria(); $query = $loop->buildModelCriteria();

2
core/lib/Thelia/Controller/Admin/ImportController.php
View File

@@ -326,7 +326,7 @@ class ImportController extends BaseAdminController
$loop = new ImportLoop($this->container); $loop = new ImportLoop($this->container);
$loop->initializeArgs([ $loop->initializeArgs([
"export" => $import->getId() "id" => $id
]); ]);
$query = $loop->buildModelCriteria(); $query = $loop->buildModelCriteria();

1
core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
View File

@@ -78,6 +78,7 @@ class CSVFormatter extends AbstractFormatter
public function encode(FormatterData $data) public function encode(FormatterData $data)
{ {
$string = ""; $string = "";
$firstRow = $data->getRow(); $firstRow = $data->getRow();
$delimiterLength = strlen($this->delimiter); $delimiterLength = strlen($this->delimiter);
$lineReturnLength = strlen($this->lineReturn); $lineReturnLength = strlen($this->lineReturn);

8
core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
View File

@@ -184,7 +184,7 @@ class FormatterData
* @return array|bool * @return array|bool
* @throws \OutOfBoundsException * @throws \OutOfBoundsException
*/ */
public function getRow($index = 0) public function getRow($index = 0, $reverseAliases = false)
{ {
if (empty($this->data)) { if (empty($this->data)) {
return false; return false;
@@ -199,7 +199,11 @@ class FormatterData
); );
} }
$row = $this->reverseAliases($this->data[$index], $this->aliases); $row = $this->data[$index];
if ($reverseAliases === true) {
$row = $this->reverseAliases($row, $this->aliases);
}
return $row; return $row;
} }