Merge pull request #13 from dachcom-digital/pimcore_10.5_ready

Pimcore 10.5 ready
dachcom-digital · Feb 13, 2023 · cc0a906 · cc0a906
2 parents 265f200 + 01cdd1d
commit cc0a906
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -12,15 +12,15 @@ This Bundle allows you to synchronise your job offers with various connectors li
 
 | Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained     | Branch     |
 |---------|----------------------------|----------------------------|--------------|----------------|------------|
-| **2.x** | `10.1` - `10.5`            | `5.4`                      | --           | Feature Branch | dev-master |
+| **2.x** | `10.5`                     | `5.4`                      | --           | Feature Branch | dev-master |
 | **1.x** | `6.0` - `6.9`              | `3.4`, `^4.4`              | 27.04.2020   | Unsupported    | 1.x        |
 
 
 ## Installation
 
 ```json
 "require" : {
-    "dachcom-digital/jobs" : "~2.0.0",
+    "dachcom-digital/jobs" : "~2.1.0",
 }
 ```
 

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 2.1.0
+- [FEATURE] Pimcore 10.5 support only
+
 ## Migrating from Version 1.x to Version 2.0.0
 
 ### Global Changes

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         }
     },
     "require": {
-        "pimcore/pimcore": "^10.1",
+        "pimcore/pimcore": "^10.5",
         "doctrine/orm": "^2.7"
     },
     "require-dev": {

diff --git a/src/JobsBundle/Resources/public/js/coreExtension/tags/jobConnectorContext.js b/src/JobsBundle/Resources/public/js/coreExtension/tags/jobConnectorContext.js
@@ -18,7 +18,7 @@ pimcore.object.tags.jobConnectorContext = Class.create(pimcore.object.tags.abstr
         this.contextDefinitions = data.context_definitions;
         this.connectors = data.connectors;
         this.fieldConfig = fieldConfig;
-        this.eventDispatcherKey = pimcore.eventDispatcher.registerTarget(this.eventDispatcherKey, this);
+        document.addEventListener(pimcore.events.postSaveObject, this.postSaveObject.bind(this));
     },
 
     getGridColumnConfig: function (field) {
@@ -46,8 +46,8 @@ pimcore.object.tags.jobConnectorContext = Class.create(pimcore.object.tags.abstr
 
     getLayoutEdit: function () {
         this.component = this.getEditLayout();
-        this.component.on('destroy', function () {
-            pimcore.eventDispatcher.unregisterTarget(this.eventDispatcherKey);
+        this.component.on('destroy', function() {
+            document.removeEventListener(pimcore.events.postSaveObject, this.postSaveObject.bind(this));
         }.bind(this));
 
         return this.component;

diff --git a/src/JobsBundle/Resources/public/js/plugin.js b/src/JobsBundle/Resources/public/js/plugin.js
@@ -1,59 +1,27 @@
-pimcore.registerNS('pimcore.plugin.Jobs');
-
-pimcore.plugin.Jobs = Class.create(pimcore.plugin.admin, {
-
-    getClassName: function () {
-        return 'pimcore.plugin.Jobs';
-    },
-
-    initialize: function () {
-        pimcore.plugin.broker.registerPlugin(this);
-
-        if (!String.prototype.format) {
-            String.prototype.format = function () {
-                var args = arguments;
-                return this.replace(/{(\d+)}/g, function (match, number) {
-                    return typeof args[number] != 'undefined'
-                        ? args[number]
-                        : match
-                        ;
-                });
-            };
-        }
-    },
-
-    uninstall: function () {
-        // void
-    },
-
-    pimcoreReady: function (params, broker) {
-
-        var jobsMenu, user = pimcore.globalmanager.get('user');
-
-        if (!user.isAllowed('jobs_permission_settings')) {
-            return false;
-        }
-
-        jobsMenu = new Ext.Action({
-            id: 'jobs_bundle_setting_button',
-            text: t('jobs.settings.configuration'),
-            iconCls: 'jobs_icon_bundle',
-            handler: this.openSettingsPanel.bind(this)
-        });
+document.addEventListener(pimcore.events.pimcoreReady, (e) => {
+
+    var user = pimcore.globalmanager.get('user'),
+        openSettings = function (config) {
+            try {
+                pimcore.globalmanager.get('jobs_bundle_settings').activate();
+            } catch (e) {
+                pimcore.globalmanager.add('jobs_bundle_settings', new Jobs.SettingsPanel(config));
+            }
+        };
+
+    if (!user.isAllowed('jobs_permission_settings')) {
+        return false;
+    }
 
-        if (layoutToolbar.settingsMenu) {
-            layoutToolbar.settingsMenu.add(jobsMenu);
-        }
-    },
+    jobsMenu = new Ext.Action({
+        id: 'jobs_bundle_setting_button',
+        text: t('jobs.settings.configuration'),
+        iconCls: 'jobs_icon_bundle',
+        handler: openSettings.bind(this)
+    });
 
-    openSettingsPanel: function () {
-        try {
-            pimcore.globalmanager.get('jobs_bundle_settings').activate();
-        } catch (e) {
-            pimcore.globalmanager.add('jobs_bundle_settings', new Jobs.SettingsPanel());
-        }
+    if (layoutToolbar.settingsMenu) {
+        layoutToolbar.settingsMenu.add(jobsMenu);
     }
 
 });
-
-new pimcore.plugin.Jobs();