Merge pull request #15 from venveo/develop

Compatibility improvements & tweaks
venveo · Jan 24, 2020 · a366fae · a366fae
2 parents 6e40edb + 6f21bdb
commit a366fae
Show file tree

Hide file tree

Showing 22 changed files with 320 additions and 262 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,20 @@
 # Bulk Edit Changelog
 
-## Unreleased
+## 2.0.0 - 2020-01-24
+{warning} The FieldProcessorInterface has slightly changed to better
+support old versions of PHP. If you wrote your own FieldProcessor,
+ensure it has been updates prior to updating to 2.0.0
+
 ### Added
 - Add support for new strategies: ADD, MULTIPLY, DIVIDE
 - Number fields now have the following strategies: REPLACE, ADD, SUBTRACT, MULTIPLY, DIVIDE
 
+### Changed
+- Changed FieldProcessorInterface to remove void declaration
+
+### Fixed
+- Improved compatibility with older versions of php
+
 ## 1.1.1 - 2019-07-22
 ### Fixed
 - Fixed potential issues with merge strategies defaulting to replace

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "venveo/craft-bulkedit",
     "description": "Bulk edit entries",
     "type": "craft-plugin",
-    "version": "1.1.1",
+    "version": "2.0.0",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -10,6 +10,7 @@
 
 namespace venveo\bulkedit;
 
+use Craft;
 use craft\base\Element;
 use craft\base\Plugin as BasePlugin;
 use craft\commerce\elements\Product;
@@ -34,19 +35,17 @@
 class Plugin extends BasePlugin
 {
 
+    const PERMISSION_BULKEDIT_ENTRIES = 'PERMISSION_BULKEDIT_ENTRIES';
+    const PERMISSION_BULKEDIT_PRODUCTS = 'PERMISSION_BULKEDIT_PRODUCTS';
+    const PERMISSION_BULKEDIT_ASSETS = 'PERMISSION_BULKEDIT_ASSETS';
+    const PERMISSION_BULKEDIT_CATEGORIES = 'PERMISSION_BULKEDIT_CATEGORIES';
+    const PERMISSION_BULKEDIT_USERS = 'PERMISSION_BULKEDIT_USERS';
     /**
      * @var Plugin
      */
     public static $plugin;
-
     public $schemaVersion = '1.1.0';
 
-    public const PERMISSION_BULKEDIT_ENTRIES = 'PERMISSION_BULKEDIT_ENTRIES';
-    public const PERMISSION_BULKEDIT_PRODUCTS = 'PERMISSION_BULKEDIT_PRODUCTS';
-    public const PERMISSION_BULKEDIT_ASSETS = 'PERMISSION_BULKEDIT_ASSETS';
-    public const PERMISSION_BULKEDIT_CATEGORIES = 'PERMISSION_BULKEDIT_CATEGORIES';
-    public const PERMISSION_BULKEDIT_USERS = 'PERMISSION_BULKEDIT_USERS';
-
     public function init()
     {
         parent::init();
@@ -57,62 +56,62 @@ public function init()
         Event::on(UserPermissions::class, UserPermissions::EVENT_REGISTER_PERMISSIONS, function (RegisterUserPermissionsEvent $event) {
             $permissions = [];
             $permissions[self::PERMISSION_BULKEDIT_ENTRIES] = [
-                'label' => \Craft::t('venveo-bulk-edit', 'Bulk Edit Entries')
+                'label' => Craft::t('venveo-bulk-edit', 'Bulk Edit Entries')
             ];
             $permissions[self::PERMISSION_BULKEDIT_ASSETS] = [
-                'label' => \Craft::t('venveo-bulk-edit', 'Bulk Edit Assets')
+                'label' => Craft::t('venveo-bulk-edit', 'Bulk Edit Assets')
             ];
             $permissions[self::PERMISSION_BULKEDIT_CATEGORIES] = [
-                'label' => \Craft::t('venveo-bulk-edit', 'Bulk Edit Categories')
+                'label' => Craft::t('venveo-bulk-edit', 'Bulk Edit Categories')
             ];
             $permissions[self::PERMISSION_BULKEDIT_USERS] = [
-                'label' => \Craft::t('venveo-bulk-edit', 'Bulk Edit Users')
+                'label' => Craft::t('venveo-bulk-edit', 'Bulk Edit Users')
             ];
 
-            if (\Craft::$app->plugins->isPluginInstalled('commerce')) {
+            if (Craft::$app->plugins->isPluginInstalled('commerce')) {
                 $permissions[self::PERMISSION_BULKEDIT_PRODUCTS] = [
-                    'label' => \Craft::t('venveo-bulk-edit', 'Bulk Edit Products')
+                    'label' => Craft::t('venveo-bulk-edit', 'Bulk Edit Products')
                 ];
             }
 
-            $event->permissions[\Craft::t('venveo-bulk-edit', 'Bulk Edit')] = $permissions;
+            $event->permissions[Craft::t('venveo-bulk-edit', 'Bulk Edit')] = $permissions;
         });
 
-        if (\Craft::$app->request->isCpRequest) {
-            if (\Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ENTRIES)) {
+        if (Craft::$app->request->isCpRequest) {
+            if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ENTRIES)) {
                 Event::on(Entry::class, Element::EVENT_REGISTER_ACTIONS,
                     function (RegisterElementActionsEvent $event) {
                         $event->actions[] = BulkEditElementAction::class;
                     }
                 );
             }
 
-            if (\Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_CATEGORIES)) {
+            if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_CATEGORIES)) {
                 Event::on(Category::class, Element::EVENT_REGISTER_ACTIONS,
                     function (RegisterElementActionsEvent $event) {
                         $event->actions[] = BulkEditElementAction::class;
                     }
                 );
             }
 
-            if (\Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ASSETS)) {
+            if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_ASSETS)) {
                 Event::on(Asset::class, Element::EVENT_REGISTER_ACTIONS,
                     function (RegisterElementActionsEvent $event) {
                         $event->actions[] = BulkEditElementAction::class;
                     }
                 );
             }
 
-            if (\Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_USERS)) {
+            if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_USERS)) {
                 Event::on(User::class, Element::EVENT_REGISTER_ACTIONS,
                     function (RegisterElementActionsEvent $event) {
                         $event->actions[] = BulkEditElementAction::class;
                     }
                 );
             }
 
-            if (\Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_PRODUCTS)) {
-                if (\Craft::$app->plugins->isPluginInstalled('commerce') && class_exists(Product::class)) {
+            if (Craft::$app->user->checkPermission(self::PERMISSION_BULKEDIT_PRODUCTS)) {
+                if (Craft::$app->plugins->isPluginInstalled('commerce') && class_exists(Product::class)) {
                     Event::on(Product::class, Element::EVENT_REGISTER_ACTIONS,
                         function (RegisterElementActionsEvent $event) {
                             $event->actions[] = BulkEditElementAction::class;

diff --git a/src/assetbundles/bulkeditelementaction/BulkEditElementActionAsset.php b/src/assetbundles/bulkeditelementaction/BulkEditElementActionAsset.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace venveo\bulkedit\assetbundles\bulkeditelementaction;
 
-use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 

diff --git a/src/assetbundles/bulkeditelementaction/dist/js/BulkEditModal.js b/src/assetbundles/bulkeditelementaction/dist/js/BulkEditModal.js
@@ -94,11 +94,12 @@ Craft.BulkEditModal = Garnish.Modal.extend(
             this._initSpinner();
             this.requestId++;
 
+            var viewParams = Craft.elementIndex.getViewParams();
             Craft.postActionRequest('venveo-bulk-edit/bulk-edit/get-fields',
                 {
                     elementIds: elementIds,
                     requestId: this.requestId,
-                    elementType: Craft.elementIndex.elementType
+                    viewParams: viewParams
                 }, function(response, textStatus) {
                 if (textStatus === 'success') {
                     if (response.success) {
@@ -136,6 +137,7 @@ Craft.BulkEditModal = Garnish.Modal.extend(
 
         _bindEventHandlersForFieldSelect: function() {
             this.$container.find('#field-edit-cancel').on('click', this.hide.bind(this));
+            this.$container.find('#select-all-elements').on('click', this._handleSelectAllElementsClicked.bind(this));
             this.$container.find('#fields-table .lightswitch').on('change', this._handleFieldSelect.bind(this));
             this.$container.find('.submit').on('click', this._handleFieldSelectSubmit.bind(this));
         },
@@ -164,6 +166,11 @@ Craft.BulkEditModal = Garnish.Modal.extend(
             }.bind(this));
         },
 
+        _handleSelectAllElementsClicked: function(e) {
+            e.preventDefault();
+            this._initSpinner();
+        },
+
         _handleFieldSelectSubmit: function(e) {
             e.preventDefault();
             const data = this.$container.find('form').serialize();

diff --git a/src/base/AbstractElementTypeProcessor.php b/src/base/AbstractElementTypeProcessor.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace venveo\bulkedit\base;
 
-abstract class AbstractElementTypeProcessor implements ElementTypeProcessorInterface {
+abstract class AbstractElementTypeProcessor implements ElementTypeProcessorInterface
+{
 
 }
diff --git a/src/base/AbstractFieldProcessor.php b/src/base/AbstractFieldProcessor.php
@@ -5,41 +5,11 @@
 use craft\base\Element;
 use craft\base\Field;
 use craft\base\FieldInterface;
+use RuntimeException;
 use venveo\bulkedit\services\BulkEdit;
 
 abstract class AbstractFieldProcessor implements FieldProcessorInterface
 {
-    public static function performMerge(Element $element, Field $field, $value): void
-    {
-        throw new \RuntimeException('Merge not implemented for this field type');
-    }
-
-    public static function performReplacement(Element $element, Field $field, $value): void
-    {
-        $fieldHandle = $field->handle;
-        $element->setFieldValue($fieldHandle, $value);
-    }
-
-    public static function performSubtraction(Element $element, Field $field, $value): void
-    {
-        throw new \RuntimeException('Subtraction not implemented for this field type');
-    }
-
-    public static function performAddition(Element $element, Field $field, $value): void
-    {
-        throw new \RuntimeException('Addition not implemented for this field type');
-    }
-
-    public static function performDivision(Element $element, Field $field, $value): void
-    {
-        throw new \RuntimeException('Division not implemented for this field type');
-    }
-
-    public static function performMultiplication(Element $element, Field $field, $value): void
-    {
-        throw new \RuntimeException('Multiplication not implemented for this field type');
-    }
-
     /**
      * @param FieldInterface $field
      * @return bool
@@ -54,7 +24,7 @@ public static function supportsField(FieldInterface $field): bool
         return false;
     }
 
-    public static function processElementField(Element $element, Field $field, $strategy, $newValue): void
+    public static function processElementField(Element $element, Field $field, $strategy, $newValue)
     {
         switch ($strategy) {
             case BulkEdit::STRATEGY_REPLACE:
@@ -77,4 +47,35 @@ public static function processElementField(Element $element, Field $field, $stra
                 break;
         }
     }
+
+    public static function performReplacement(Element $element, Field $field, $value)
+    {
+        $fieldHandle = $field->handle;
+        $element->setFieldValue($fieldHandle, $value);
+    }
+
+    public static function performMerge(Element $element, Field $field, $value)
+    {
+        throw new RuntimeException('Merge not implemented for this field type');
+    }
+
+    public static function performSubtraction(Element $element, Field $field, $value)
+    {
+        throw new RuntimeException('Subtraction not implemented for this field type');
+    }
+
+    public static function performAddition(Element $element, Field $field, $value)
+    {
+        throw new RuntimeException('Addition not implemented for this field type');
+    }
+
+    public static function performMultiplication(Element $element, Field $field, $value)
+    {
+        throw new RuntimeException('Multiplication not implemented for this field type');
+    }
+
+    public static function performDivision(Element $element, Field $field, $value)
+    {
+        throw new RuntimeException('Division not implemented for this field type');
+    }
 }
diff --git a/src/base/ElementTypeProcessorInterface.php b/src/base/ElementTypeProcessorInterface.php
@@ -1,9 +1,11 @@
 <?php
+
 namespace venveo\bulkedit\base;
 
 use craft\web\User;
 
-interface ElementTypeProcessorInterface {
+interface ElementTypeProcessorInterface
+{
 
     /**
      * Gets a unique list of field layouts from a list of element IDs

diff --git a/src/base/FieldProcessorInterface.php b/src/base/FieldProcessorInterface.php
@@ -19,9 +19,9 @@ public static function getSupportedFields(): array;
      */
     public static function getSupportedStrategies(): array;
 
-    public static function performReplacement(Element $element, Field $field, $value): void;
+    public static function performReplacement(Element $element, Field $field, $value);
 
-    public static function performSubtraction(Element $element, Field $field, $value): void;
+    public static function performSubtraction(Element $element, Field $field, $value);
 
-    public static function performMerge(Element $element, Field $field, $value): void;
+    public static function performMerge(Element $element, Field $field, $value);
 }