Merge pull request #8 from pbs/develop

v4.0.3.4
pbs · Jun 3, 2024 · 58d726b · 58d726b
2 parents 208c502 + 4a88ced
commit 58d726b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.3.4 - 2024-06-03
+
+### Fixed
+- Show sync Switch had an unbroken `case` resulting in invalid data
+- POST body data was not correctly getting sent in Synchronize action requests 
+
 ## 4.0.3.3 - 2024-06-03
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "moon/pbs-media-manager-craft-plugin-food",
   "description": "Media Manager 4 for PBS API",
-  "version": "4.0.3.3",
+  "version": "4.0.3.4",
   "type": "craft-plugin",
   "keywords": ["craftcms", "pbs", "media-manager"],
   "license": "MIT",

diff --git a/src/assetbundles/synchronizecpsection/dist/js/Synchronize.js b/src/assetbundles/synchronizecpsection/dist/js/Synchronize.js
@@ -145,7 +145,7 @@
 
           $('#synchronize-single-button').addClass('disabled');
 
-          Craft.sendActionRequest('POST', 'mediamanager/synchronize/synchronize-single', { data })
+          Craft.sendActionRequest('POST', 'mediamanager/synchronize/synchronize-single', { data: data })
             .then((response) => {
               if (response.data.success) {
                 Craft.cp.displayNotice(Craft.t('mediamanager', 'Synchronize started.'));
@@ -183,7 +183,7 @@
           fieldsToSync: fieldsToSync,
         };
 
-        Craft.sendActionRequest('POST', 'mediamanager/synchronize/synchronize-all', data)
+        Craft.sendActionRequest('POST', 'mediamanager/synchronize/synchronize-all', { data: data})
           .then((response) => {
             if (response.data.success) {
               Craft.cp.displayNotice(Craft.t('mediamanager', 'Synchronize for all show started.'));
@@ -214,8 +214,7 @@
         var data = {
           fieldsToSync: fieldsToSync,
         };
-
-        Craft.sendActionRequest('POST', 'mediamanager/synchronize/synchronize-show-entries', data)
+        Craft.sendActionRequest('POST', 'mediamanager/synchronize/synchronize-show-entries', {data: data})
           .then((response) => {
             if (response.data.success) {
               Craft.cp.displayNotice(Craft.t('mediamanager', 'Synchronize for show entries started.'));

diff --git a/src/controllers/SynchronizeController.php b/src/controllers/SynchronizeController.php
@@ -243,7 +243,7 @@ public function actionSynchronizeShowEntries()
             ]);
         }
 
-	      $fieldsToSync = $request->getBodyParam('fieldsToSync');
+	      $fieldsToSync = $request->getBodyParam('fieldsToSync', []);
 
         $synchronize = MediaManager::getInstance()->api->synchronizeShowEntries( $validatedShows, $fieldsToSync);
 

diff --git a/src/jobs/ShowEntriesSync.php b/src/jobs/ShowEntriesSync.php
@@ -323,11 +323,13 @@ public function execute( $queue ): void
 
 		            break;
 
-	              case 'slug':
+                case 'slug':
 
-									if(isset($showAttributes->slug)){
-										$defaultFields[SynchronizeHelper::getApiField($apiField, 'showApiColumnFields')] = $showAttributes->slug;
-									}
+                    if(isset($showAttributes->slug)){
+                        $defaultFields[SynchronizeHelper::getApiField($apiField, 'showApiColumnFields')] = $showAttributes->slug;
+                    }
+
+                    break;
 
                 case 'premiered_on':
                     if( $showAttributes->premiered_on != null) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -243,7 +243,7 @@ public function actionSynchronizeShowEntries() @@
                 ]);
             }
-    	      $fieldsToSync = $request->getBodyParam('fieldsToSync');
+    	      $fieldsToSync = $request->getBodyParam('fieldsToSync', []);
             $synchronize = MediaManager::getInstance()->api->synchronizeShowEntries( $validatedShows, $fieldsToSync);
@@ Expand Down @@