From 8c1124b2dc60205f26efd468594930ada8db9e98 Mon Sep 17 00:00:00 2001
From: Alex Dryden <adryden3@illinois.edu>
Date: Wed, 6 Jul 2022 14:51:28 -0400
Subject: [PATCH 1/2] remove unused function

---
 Module.php | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/Module.php b/Module.php
index 528040e..5378722 100644
--- a/Module.php
+++ b/Module.php
@@ -2381,20 +2381,6 @@ public function siteSettingsRemoveAutoAssign(Event $event)
             ->setOption('info', 'The Teams Module manages how items become associated with sites, so this has been disabled.');
     }
 
-    public function removeDefaultSite(Event $event)
-    {
-
-        //pre-fill with the sites that should be default based on that user's team.
-//        $team_sites = $this->currentTeam()->getTeamSites();
-//        $site_ids = [];
-//        foreach ($team_sites as $team_site):
-//            $site_ids[] = $team_site->getSite()->getId();
-//        endforeach;
-//        $event->getTarget()->get('user-settings')
-//            ->get('default_item_sites')
-//            ->setAttribute('value', $site_ids);
-    }
-
     public function attachListeners(SharedEventManagerInterface $sharedEventManager)
     {
         $services = $this->getServiceLocator();
@@ -2864,13 +2850,6 @@ public function attachListeners(SharedEventManagerInterface $sharedEventManager)
             [$this, 'addUserFormElement']
         );
 
-
-        $sharedEventManager->attach(
-            \Omeka\Form\UserForm::class,
-            'form.add_elements',
-            [$this, 'removeDefaultSite']
-        );
-
         $sharedEventManager->attach(
             \Omeka\Form\SiteForm::class,
             'form.add_elements',

From 82c862b39233b25199cbf979d4dc8eb6ada9796e Mon Sep 17 00:00:00 2001
From: Alex Dryden <adryden3@illinois.edu>
Date: Wed, 6 Jul 2022 14:59:30 -0400
Subject: [PATCH 2/2] Removing this in favor of keeping user default sites up
 to date with the user's current team.

Incidentally, this was causing the corrrect sites to not be added
to items created through batch create because it wasn't checking
to see if 'team' was included in the request.
---
 Module.php | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/Module.php b/Module.php
index 5378722..b0602fe 100644
--- a/Module.php
+++ b/Module.php
@@ -1800,37 +1800,7 @@ public function resourceTemplateTeamsAdd(Event $event)
         echo $view->partial('teams/partial/resource-template/add', ['team_id' => $team_id]);
     }
 
-    //Handle Items
-    //TODO: NEED TO ADD BUTTON TO USE TEAMS FOR SITES (or not, operation is VERY disordered if they arne't in sync)
-    //TODO: NEED TO ADD SOME TEXT OR FIND ANOTHER SOLUTION FOR THE ITEM SITES THAT DONT BELONG TO THE USERS CURRENT TEAM
-    //if user selects to use teams for item sites, update sites data from TeamSite before API executes on form data
-    public function itemPre(Event $event)
-    {
-
-        //get request content
-        $request = $event->getParam('request');
-        $content = $request->getContent();
-
-        //get team(s)
-        $teams = $content['team'];
-
-        $em = $this->getServiceLocator()->get('Omeka\EntityManager');
-
-        //get sites associated with teams(s)
-        $site_ids = [];
-        foreach ($teams as $team_id):
-            $team = $em->getRepository('Teams\Entity\Team')->findOneBy(['id'=>$team_id]);
-        $team_sites = $team->getTeamSites();
-        foreach ($team_sites as $team_site):
-                $site_ids[] = $team_site->getSite()->getId();
-        endforeach;
-        endforeach;
 
-        //update request content
-        $content['o:site'] = $site_ids;
-        $request->setContent($content);
-        $event->setParam('request', $request);
-    }
     /**
      *
      * On update, remove all TeamResources associated with item and associated media, and generate new TeamResources
@@ -2576,12 +2546,6 @@ public function attachListeners(SharedEventManagerInterface $sharedEventManager)
             [$this, 'itemUpdate']
         );
 
-        $sharedEventManager->attach(
-            ItemAdapter::class,
-            'api.hydrate.pre',
-            [$this, 'itemPre']
-        );
-
 
         $sharedEventManager->attach(
             MediaAdapter::class,