Merge pull request #16 from DivanteLtd/pimcore6

Pimcore 6.3 and up
DivanteLtd · Feb 6, 2020 · cec96df · cec96df
2 parents 2cc90d6 + f343641
commit cec96df
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     }
   ],
   "require": {
-    "pimcore/pimcore": ">5.4 <6.2",
+    "pimcore/pimcore": "^6.3",
     "divanteltd/pimcoredevkit": "^0.7",
     "dpfaffenbauer/process-manager": "^2.0"
   },

diff --git 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}
      */

diff --git 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
@@ -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;