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

Finish export forms

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Config/Resources/form.xml
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Formatter.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	modifié:         core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/ImportExport/Both/NewsletterImportExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/MailingExport.php
	renommé:         core/lib/Thelia/ImportExport/ExportHandlerInterface.php -> core/lib/Thelia/ImportExport/ExportHandler.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
	nouveau fichier: templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/export-page.html
	modifié:         templates/backOffice/default/export.html
This commit is contained in:
Benjamin Perche
2014-07-11 16:06:15 +02:00
parent 33695a7886
commit b6937ab421
16 changed files with 453 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Model/Export.php
View File

@@ -5,7 +5,7 @@ namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Thelia\Core\Translation\Translator;
use Thelia\ImportExport\ExportHandlerInterface;
use Thelia\ImportExport\ExportHandler;
use Thelia\Model\Base\Export as BaseExport;
use Thelia\Model\Map\ExportTableMap;
@@ -77,7 +77,7 @@ class Export extends BaseExport
/**
* @param ContainerInterface $container
* @return ExportHandlerInterface
* @return ExportHandler
* @throws \ErrorException
*/
public function getHandleClassInstance(ContainerInterface $container)
@@ -101,13 +101,13 @@ class Export extends BaseExport
$instance = new $class($container);
if (!$instance instanceof ExportHandlerInterface) {
if (!$instance instanceof ExportHandler) {
throw new \ErrorException(
Translator::getInstance()->trans(
"The class \"%class\" must implement %interface",
[
"%class" => $class,
"%interface" => "\\Thelia\\ImportExport\\ExportHandlerInterface",
"%interface" => "\\Thelia\\ImportExport\\ExportHandler",
]
)
);

6
core/lib/Thelia/Model/Import.php
View File

@@ -4,7 +4,7 @@ namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Thelia\ImportExport\ExportHandlerInterface;
use Thelia\ImportExport\ExportHandler;
use Thelia\Model\Base\Import as BaseImport;
use Thelia\Model\Map\ImportTableMap;
@@ -89,12 +89,12 @@ class Import extends BaseImport
$instance = new $class($container);
if (!$class instanceof ExportHandlerInterface) {
if (!$class instanceof ExportHandler) {
throw new \ErrorException(
"The class \"%class\" must implement %interface",
[
"%class" => $class,
"%interface" => "\\Thelia\\ImportExport\\ExportHandlerInterface",
"%interface" => "\\Thelia\\ImportExport\\ExportHandler",
]
);
}