From d333fad49c870d892f9abe75bbedf3f238fcaec2 Mon Sep 17 00:00:00 2001 From: Svenvdzwet Date: Wed, 28 Dec 2022 11:29:24 +0100 Subject: [PATCH] Changed namespacing so the fix is usable as long as the fix is not merged --- .upgrade.yml | 18 ++++++------ _config/config.yml | 2 +- client/src/js/manager.js | 2 +- client/src/js/managerBulkEditingForm.js | 2 +- composer.json | 8 +++--- docs/en/BULK_MANAGER.md | 8 +++--- src/BulkManager/BulkAction/ArchiveHandler.php | 22 +++++++-------- src/BulkManager/BulkAction/DeleteHandler.php | 22 +++++++-------- src/BulkManager/BulkAction/EditHandler.php | 26 ++++++++--------- src/BulkManager/BulkAction/Handler.php | 28 +++++++++---------- src/BulkManager/BulkAction/PublishHandler.php | 24 ++++++++-------- .../BulkAction/UnPublishHandler.php | 24 ++++++++-------- src/BulkManager/BulkAction/UnlinkHandler.php | 22 +++++++-------- src/BulkManager/BulkManager.php | 4 +-- src/BulkTools/HTTPBulkToolsResponse.php | 2 +- src/BulkUploader/BulkUploadField.php | 2 +- src/BulkUploader/BulkUploadHandler.php | 12 ++++---- src/BulkUploader/BulkUploader.php | 8 +++--- .../BulkManager/BulkManagerButtons.ss | 0 .../BulkUpload/BulkUploader.ss | 0 20 files changed, 118 insertions(+), 118 deletions(-) rename templates/{Colymba => Violet88}/BulkManager/BulkManagerButtons.ss (100%) rename templates/{Colymba => Violet88}/BulkUpload/BulkUploader.ss (100%) diff --git a/.upgrade.yml b/.upgrade.yml index be82823..2257e30 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -1,10 +1,10 @@ mappings: - GridFieldBulkActionDeleteHandler: Colymba\BulkManager\BulkAction\DeleteHandler - GridFieldBulkActionEditHandler: Colymba\BulkManager\BulkAction\EditHandler - GridFieldBulkActionHandler: Colymba\BulkManager\BulkAction\Handler - GridFieldBulkActionUnlinkHandler: Colymba\BulkManager\BulkAction\UnlinkHandler - GridFieldBulkManager: Colymba\BulkManager\BulkManager - BulkUploadField: Colymba\BulkUpload\BulkUploadField - GridFieldBulkImageUpload: Colymba\BulkUpload\GridFieldBulkImageUpload - GridFieldBulkUpload: Colymba\BulkUpload\BulkUploader - GridFieldBulkUpload_Request: Colymba\BulkUpload\BulkUploadHandler + GridFieldBulkActionDeleteHandler: Violet88\BulkManager\BulkAction\DeleteHandler + GridFieldBulkActionEditHandler: Violet88\BulkManager\BulkAction\EditHandler + GridFieldBulkActionHandler: Violet88\BulkManager\BulkAction\Handler + GridFieldBulkActionUnlinkHandler: Violet88\BulkManager\BulkAction\UnlinkHandler + GridFieldBulkManager: Violet88\BulkManager\BulkManager + BulkUploadField: Violet88\BulkUpload\BulkUploadField + GridFieldBulkImageUpload: Violet88\BulkUpload\GridFieldBulkImageUpload + GridFieldBulkUpload: Violet88\BulkUpload\BulkUploader + GridFieldBulkUpload_Request: Violet88\BulkUpload\BulkUploadHandler diff --git a/_config/config.yml b/_config/config.yml index 4df111e..7893658 100644 --- a/_config/config.yml +++ b/_config/config.yml @@ -1,3 +1,3 @@ SilverStripe\Admin\LeftAndMain: extra_requirements_javascript: - - 'colymba/gridfield-bulk-editing-tools: client/dist/js/main.js' + - 'violet88/gridfield-bulk-editing-tools: client/dist/js/main.js' diff --git a/client/src/js/manager.js b/client/src/js/manager.js index 06e3957..649d5e2 100644 --- a/client/src/js/manager.js +++ b/client/src/js/manager.js @@ -2,7 +2,7 @@ import jQuery from 'jquery'; import i18n from 'i18n'; -jQuery.entwine('colymba', ($) => { +jQuery.entwine('violet88', ($) => { /** * Makes sure the component is above the headers */ diff --git a/client/src/js/managerBulkEditingForm.js b/client/src/js/managerBulkEditingForm.js index 5be7856..9c69708 100644 --- a/client/src/js/managerBulkEditingForm.js +++ b/client/src/js/managerBulkEditingForm.js @@ -1,7 +1,7 @@ /* global window */ import jQuery from 'jquery'; -jQuery.entwine('colymba', ($) => { +jQuery.entwine('violet88', ($) => { /** * Toggle all accordion forms * open or closed diff --git a/composer.json b/composer.json index 70eb9ce..c93a756 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "colymba/gridfield-bulk-editing-tools", + "name": "violet88/gridfield-bulk-editing-tools", "type": "silverstripe-vendormodule", "description": "SilverStripe GridField component to upload images/files and edit records in bulk", "homepage": "https://github.com/colymba/GridFieldBulkEditingTools", @@ -30,9 +30,9 @@ }, "autoload": { "psr-4": { - "Colymba\\BulkTools\\": "src/BulkTools/", - "Colymba\\BulkManager\\": "src/BulkManager/", - "Colymba\\BulkUpload\\": "src/BulkUploader/" + "Violet88\\BulkTools\\": "src/BulkTools/", + "Violet88\\BulkManager\\": "src/BulkManager/", + "Violet88\\BulkUpload\\": "src/BulkUploader/" } } } diff --git a/docs/en/BULK_MANAGER.md b/docs/en/BULK_MANAGER.md index 3838016..7cfc171 100644 --- a/docs/en/BULK_MANAGER.md +++ b/docs/en/BULK_MANAGER.md @@ -12,7 +12,7 @@ $config->addComponent(new \Colymba\BulkManager\BulkManager()); The component's options can be configurated individually or in bulk through the 'config' functions like this: ```php -$config->getComponentByType('Colymba\\BulkManager\\BulkManager')->setConfig($reference, $value); +$config->getComponentByType('Violet88\\BulkManager\\BulkManager')->setConfig($reference, $value); ``` ### $config overview @@ -27,14 +27,14 @@ To add a custom bulk action to the list use: ```php $config - ->getComponentByType('Colymba\\BulkManager\\BulkManager') + ->getComponentByType('Violet88\\BulkManager\\BulkManager') ->addBulkAction('Namespace\\ClassName') ``` #### Custom action handler -When creating your own bulk action `RequestHandler`, you should extend `Colymba\BulkManager\BulkAction\Handler` which will expose 2 useful functions `getRecordIDList()` and `getRecords()` returning either an array with the selected records IDs or a `DataList` of the selected records. +When creating your own bulk action `RequestHandler`, you should extend `Violet88\BulkManager\BulkAction\Handler` which will expose 2 useful functions `getRecordIDList()` and `getRecords()` returning either an array with the selected records IDs or a `DataList` of the selected records. Make sure to define the handler's `$url_segment`, from which the handler will be called and its relating `$allowed_actions` and `$url_handlers`. See `Handler`, `DeleteHandler` and `UnlinkHandler` for examples. #### Front-end config -Bulk action handler's front-end configuration is set via class properties `label`, `icon`, `buttonClasses`, `xhr` and `destructive`. See `Handler`, `DeleteHandler` and `UnlinkHandler` for reference and examples. +Bulk action handler's front-end configuration is set via class properties `label`, `icon`, `buttonClasses`, `xhr` and `destructive`. See `Handler`, `DeleteHandler` and `UnlinkHandler` for reference and examples. diff --git a/src/BulkManager/BulkAction/ArchiveHandler.php b/src/BulkManager/BulkAction/ArchiveHandler.php index 32b4b9d..a40b3d8 100644 --- a/src/BulkManager/BulkAction/ArchiveHandler.php +++ b/src/BulkManager/BulkAction/ArchiveHandler.php @@ -1,9 +1,9 @@ addExtraClass('center cms-content'); $form->setAttribute('data-pjax-fragment', 'CurrentForm Content'); - Requirements::javascript('colymba/gridfield-bulk-editing-tools:client/dist/js/main.js'); - Requirements::css('colymba/gridfield-bulk-editing-tools:client/dist/styles/main.css'); - Requirements::add_i18n_javascript('colymba/gridfield-bulk-editing-tools:lang'); + Requirements::javascript('violet88/gridfield-bulk-editing-tools:client/dist/js/main.js'); + Requirements::css('violet88/gridfield-bulk-editing-tools:client/dist/styles/main.css'); + Requirements::add_i18n_javascript('violet88/gridfield-bulk-editing-tools:lang'); if ($this->request->isAjax()) { $response = new HTTPResponse( diff --git a/src/BulkManager/BulkAction/Handler.php b/src/BulkManager/BulkAction/Handler.php index 69be806..2926514 100644 --- a/src/BulkManager/BulkAction/Handler.php +++ b/src/BulkManager/BulkAction/Handler.php @@ -1,6 +1,6 @@ destructive = $destructive; return $this; } - + /** * True if the hanlder performs destructive actions - * + * * @return boolean */ public function getDestructive() @@ -130,11 +130,11 @@ class Handler extends RequestHandler /** * Set if handler is called via XHR - * + * * @param boolean xhr If true the handler will be called via an XHR from front-end * @return RequestHandler */ - + public function setXhr($xhr) { $this->xhr = $xhr; diff --git a/src/BulkManager/BulkAction/PublishHandler.php b/src/BulkManager/BulkAction/PublishHandler.php index 0afd41e..c090be0 100644 --- a/src/BulkManager/BulkAction/PublishHandler.php +++ b/src/BulkManager/BulkAction/PublishHandler.php @@ -1,9 +1,9 @@ setStatusCode(500); $response->setMessage($ex->getMessage()); } - + return $response; } } diff --git a/src/BulkManager/BulkAction/UnPublishHandler.php b/src/BulkManager/BulkAction/UnPublishHandler.php index 7bdec81..f6821d4 100644 --- a/src/BulkManager/BulkAction/UnPublishHandler.php +++ b/src/BulkManager/BulkAction/UnPublishHandler.php @@ -1,9 +1,9 @@ getRecords(); $response = new HTTPBulkToolsResponse(false, $this->gridField); - + try { foreach ($records as $record) { diff --git a/src/BulkManager/BulkAction/UnlinkHandler.php b/src/BulkManager/BulkAction/UnlinkHandler.php index 0dc8f45..f6ed78c 100644 --- a/src/BulkManager/BulkAction/UnlinkHandler.php +++ b/src/BulkManager/BulkAction/UnlinkHandler.php @@ -1,9 +1,9 @@ addExtraClass('bulkActionName no-change-track form-group--no-label') ->setAttribute('id', '') ->setEmptyString(_t('SilverStripe\Admin\LeftAndMain.DropdownBatchActionsDefault', 'Choose an action...')); - + $templateData = array( 'Menu' => $dropDownActionsList->FieldHolder(), diff --git a/src/BulkTools/HTTPBulkToolsResponse.php b/src/BulkTools/HTTPBulkToolsResponse.php index 6c6c930..c0c0ac1 100644 --- a/src/BulkTools/HTTPBulkToolsResponse.php +++ b/src/BulkTools/HTTPBulkToolsResponse.php @@ -1,6 +1,6 @@ component->getFileRelationName($this->gridField); $record->{"{$fileRelationName}ID"} = $fileID; $record->write(); //HasManyList call write on record but not ManyManyList, so we call it here again - + $this->gridField->list->add($record); if ( @@ -111,7 +111,7 @@ class BulkUploadHandler extends RequestHandler { $assetAdmin = AssetAdmin::singleton(); $uploadResponse = $assetAdmin->apiCreateFile($request); - + if ($uploadResponse->getStatusCode() == 200) { $responseData = Convert::json2array($uploadResponse->getBody()); @@ -121,7 +121,7 @@ class BulkUploadHandler extends RequestHandler $bulkToolsResponse = new HTTPBulkToolsResponse(false, $this->gridField); $bulkToolsResponse->addSuccessRecord($record); - + $responseData['bulkTools'] = json_decode($bulkToolsResponse->getBody() ?? ''); $uploadResponse->setBody(json_encode(array($responseData))); } diff --git a/src/BulkUploader/BulkUploader.php b/src/BulkUploader/BulkUploader.php index 9a4b7e8..b7ebc63 100644 --- a/src/BulkUploader/BulkUploader.php +++ b/src/BulkUploader/BulkUploader.php @@ -1,6 +1,6 @@ $data->renderWith('Colymba\\BulkUpload\\BulkUploader'), + 'before' => $data->renderWith('Violet88\\BulkUpload\\BulkUploader'), ); } diff --git a/templates/Colymba/BulkManager/BulkManagerButtons.ss b/templates/Violet88/BulkManager/BulkManagerButtons.ss similarity index 100% rename from templates/Colymba/BulkManager/BulkManagerButtons.ss rename to templates/Violet88/BulkManager/BulkManagerButtons.ss diff --git a/templates/Colymba/BulkUpload/BulkUploader.ss b/templates/Violet88/BulkUpload/BulkUploader.ss similarity index 100% rename from templates/Colymba/BulkUpload/BulkUploader.ss rename to templates/Violet88/BulkUpload/BulkUploader.ss