[Badge] fixes organization filter for data source

claroline · Mar 1, 2023 · 74e411f · 74e411f
1 parent 040f776
commit 74e411f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/plugin/open-badge/Listener/DataSource/BadgesSource.php b/src/plugin/open-badge/Listener/DataSource/BadgesSource.php
@@ -37,16 +37,8 @@ public function getData(GetDataEvent $event)
 
         if (DataSource::CONTEXT_WORKSPACE === $event->getContext()) {
             $options['hiddenFilters']['workspace'] = $event->getWorkspace()->getUuid();
-        } elseif (!$this->authorization->isGranted('ROLE_ADMIN')) {
-            // only display badges for the current user organization
-            $options['hiddenFilters']['organizations'] = [];
-
-            $user = $this->tokenStorage->getToken()->getUser();
-            if ($user instanceof User) {
-                $options['hiddenFilters']['organizations'] = array_map(function (Organization $organization) {
-                    return $organization->getUuid();
-                }, $user->getOrganizations());
-            }
+        } elseif (!$this->authorization->isGranted('ROLE_ADMIN') && (empty($options['filters']) || empty($options['filters']['organizations']))) {
+            $options['hiddenFilters']['organizations'] = $this->getOrganizations();
         }
 
         $event->setData(
@@ -55,4 +47,16 @@ public function getData(GetDataEvent $event)
 
         $event->stopPropagation();
     }
+
+    private function getOrganizations(): array
+    {
+        $user = $this->tokenStorage->getToken()->getUser();
+        if ($user instanceof User) {
+            return array_map(function (Organization $organization) {
+                return $organization->getUuid();
+            }, $user->getOrganizations());
+        }
+
+        return [];
+    }
 }
diff --git a/src/plugin/open-badge/Resources/modules/data/sources/badges.js b/src/plugin/open-badge/Resources/modules/data/sources/badges.js
@@ -48,6 +48,14 @@ export default {
         options: {
           objectClass: 'Claroline\\OpenBadgeBundle\\Entity\\BadgeClass'
         }
+      }, {
+        name: 'organizations',
+        type: 'organizations',
+        label: trans('organizations'),
+        displayable: false,
+        displayed: false,
+        sortable: false,
+        filterable: true
       }
     ],
     card: BadgeCard