@@ -738,7 +738,8 @@ public function teamSelectorNav(Event $event)
738738
739739 public function bypassTeamsSortSelector (Event $ event )
740740 {
741- if ($ this ->getUser ()->getRole () == 'global_admin ' ){
741+ $ user = $ this ->getUser ();
742+ if ($ user && $ user ->getRole () == 'global_admin ' ){
742743 $ view = $ event ->getTarget ();
743744 $ params = $ view ->params ();
744745 $ bypassTeams = $ params ->fromQuery ('bypass_team_filter ' );
@@ -2473,11 +2474,22 @@ public function attachListeners(SharedEventManagerInterface $sharedEventManager)
24732474 'view.layout ' ,
24742475 [$ this , 'teamSelectorNav ' ]
24752476 );
2476- $ sharedEventManager ->attach (
2477- '* ' ,
2478- 'view.browse.before ' ,
2479- [$ this , 'bypassTeamsSortSelector ' ]
2480- );
2477+ $ teamFilterable = [
2478+ 'Omeka\Controller\Admin\Item ' ,
2479+ 'Omeka\Controller\Admin\ItemSet ' ,
2480+ 'Omeka\Controller\Admin\ResourceTemplate ' ,
2481+ 'Omeka\Controller\Admin\Media ' ,
2482+ 'Omeka\Controller\Admin\Asset ' ,
2483+ 'Omeka\Controller\SiteAdmin\Index '
2484+
2485+ ];
2486+ foreach ($ teamFilterable as $ controller ) {
2487+ $ sharedEventManager ->attach (
2488+ $ controller ,
2489+ 'view.browse.before ' ,
2490+ [$ this , 'bypassTeamsSortSelector ' ]
2491+ );
2492+ }
24812493
24822494 $ sharedEventManager ->attach (
24832495 'Omeka\Controller\Admin\User ' ,
0 commit comments