From 9a496780ec5a8628b1a44dfecade6a746ffb91ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Tue, 4 Feb 2020 15:47:27 +0100 Subject: [PATCH 1/6] Bump pimcore's version to 6. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index beb6e17..5b7393d 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ } ], "require": { - "pimcore/pimcore": "^5.5", + "pimcore/pimcore": "^5.5 | ^6", "divanteltd/pimcoredevkit": "^0.7", "dpfaffenbauer/process-manager": "^2.0" }, From 4138e787c6dbc5d3cf46d1e12f7a94a46331c0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Thu, 6 Feb 2020 15:02:42 +0100 Subject: [PATCH 2/6] Fixes for Pimcore 6. --- .../Controller/GridConfigController.php | 5 +++-- .../Resources/public/js/process-manager/scheduled-export.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ScheduledExportBundle/Controller/GridConfigController.php b/src/ScheduledExportBundle/Controller/GridConfigController.php index dcf5331..820b129 100644 --- a/src/ScheduledExportBundle/Controller/GridConfigController.php +++ b/src/ScheduledExportBundle/Controller/GridConfigController.php @@ -30,12 +30,13 @@ public function getListAction(Request $request) $result = []; /** @var GridConfig $gridConfig */ - foreach ($gridConfigs->gridConfigs as $gridConfig) { + foreach ($gridConfigs->getGridConfigs() as $gridConfig) { $classDefinition = ClassDefinition::getById($gridConfig->getClassId()); $user = \Pimcore\Model\User::getById($gridConfig->getOwnerId()); $result[] = [ "id" => $gridConfig->getId(), - "name" => $classDefinition->getName() . ":" . $gridConfig->getName() . " (" . $user->getName() . ")" + "name" => "[" . $gridConfig->getId() . "] " . $classDefinition->getName() . ": " . + $gridConfig->getName() . " (" . $user->getName() . ")" ]; } diff --git a/src/ScheduledExportBundle/Resources/public/js/process-manager/scheduled-export.js b/src/ScheduledExportBundle/Resources/public/js/process-manager/scheduled-export.js index bb96302..f052294 100644 --- a/src/ScheduledExportBundle/Resources/public/js/process-manager/scheduled-export.js +++ b/src/ScheduledExportBundle/Resources/public/js/process-manager/scheduled-export.js @@ -4,7 +4,7 @@ * @copyright Copyright (c) 2017 Divante Ltd. (https://divante.co) */ -$(document).on("processmanager.ready", function() { +document.addEventListener('processmanager.ready', function() { processmanager.executable.types.scheduledexport = Class.create(pimcore.plugin.processmanager.executable.abstractType, { getItems: function () { var storedThis = this; From 2061f9199664acda6c73623f034c94ac3024c8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Thu, 6 Feb 2020 15:17:37 +0100 Subject: [PATCH 3/6] Fixes for Pimcore6. --- src/ScheduledExportBundle/Command/ScheduledExportCommand.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ScheduledExportBundle/Command/ScheduledExportCommand.php b/src/ScheduledExportBundle/Command/ScheduledExportCommand.php index b890a06..361d94b 100644 --- a/src/ScheduledExportBundle/Command/ScheduledExportCommand.php +++ b/src/ScheduledExportBundle/Command/ScheduledExportCommand.php @@ -10,6 +10,7 @@ use Divante\ScheduledExportBundle\Export\Export; use Pimcore\Console\AbstractCommand; use Pimcore\Model\DataObject\AbstractObject; +use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; @@ -20,10 +21,8 @@ * * @package Divante\ScheduledExportBundle\Command */ -class ScheduledExportCommand extends AbstractCommand +class ScheduledExportCommand extends ContainerAwareCommand { - use ContainerAwareTrait; - /** * {@inheritdoc} */ From f26a5c41b27195599291f9d010ff535e10679e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Thu, 6 Feb 2020 15:18:23 +0100 Subject: [PATCH 4/6] Fixes for Pimcore6. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b7393d..4b18b60 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ } ], "require": { - "pimcore/pimcore": "^5.5 | ^6", + "pimcore/pimcore": "^6", "divanteltd/pimcoredevkit": "^0.7", "dpfaffenbauer/process-manager": "^2.0" }, From de06e5c1c56132bc0e677e7195bff3f8268b80f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Thu, 6 Feb 2020 15:20:50 +0100 Subject: [PATCH 5/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4b18b60..5b7393d 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ } ], "require": { - "pimcore/pimcore": "^6", + "pimcore/pimcore": "^5.5 | ^6", "divanteltd/pimcoredevkit": "^0.7", "dpfaffenbauer/process-manager": "^2.0" }, From f1c76a8e72933d152cbe23ead54a60e2ca7c7911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Thu, 6 Feb 2020 15:59:02 +0100 Subject: [PATCH 6/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b7393d..c144aa3 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ } ], "require": { - "pimcore/pimcore": "^5.5 | ^6", + "pimcore/pimcore": "^6.3", "divanteltd/pimcoredevkit": "^0.7", "dpfaffenbauer/process-manager": "^2.0" },