Merge branch 'master' into develop

flipboxfactory · Jun 14, 2018 · 44ce3a3 · 44ce3a3
2 parents af1d543 + 4bb7248
commit 44ce3a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Changelog
 =========
+## Unreleased
+### Fixed
+- User Type associations were not saving correctly when all associations were un-selected.
+
 ## 1.0.0-rc.13 - 2018-06-07
 ### Added
 - Services have a configurable cache duration and dependency that can be set via the plugin's settings config.

diff --git a/src/cp/controllers/UserTypesController.php b/src/cp/controllers/UserTypesController.php
@@ -77,8 +77,9 @@ public function actionSaveAssociations(): Response
             $request->getRequiredBodyParam('organization')
         );
 
+        $types = array_keys(array_filter((array)$request->getRequiredBodyParam('types')));
         $query = Organizations::getInstance()->getUserTypes()->getQuery([
-            'id' => array_keys(array_filter((array)$request->getRequiredBodyParam('types')))
+            'id' => empty($types) ? ':empty:' : $types
         ]);
 
         $query->setCachedResult(