Merge pull request #30 from loannis/CO-2265_Fix_Tablelocator_get_error

CO-2265_Fix_Tablelocator_get_error
COmanage · Nov 8, 2021 · 92f38bd · 92f38bd
2 parents 009a476 + 388cead
commit 92f38bd
Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/Lib/Identifier/Sequence.php b/app/src/Lib/Identifier/Sequence.php
@@ -41,7 +41,7 @@ class Sequence extends ReferenceIdService {
    */
 
   public function generate(\App\Model\Entity\Matchgrid $mgConfig, \ADOConnection $dbc) {
-    $MatchgridSettings = Cake\Datasource\FactoryLocator::get('MatchgridSettings');
+    $MatchgridSettings = Cake\Datasource\FactoryLocator::get('Table')->get('MatchgridSettings');
 
     // We'll use the matchgrid ID rather than name in the sequence name to avoid
     // issues if the matchgrid is renamed for some reason.

diff --git a/app/src/Lib/Match/MatchService.php b/app/src/Lib/Match/MatchService.php
@@ -104,7 +104,7 @@ public function attachReferenceId(string $sor, string $sorid, AttributeManager $
    */
 
   protected function generateReferenceId() {
-    $MatchgridSettings = FactoryLocator::get('MatchgridSettings');
+    $MatchgridSettings = FactoryLocator::get('Table')->get('MatchgridSettings');
 
     if($MatchgridSettings->getReferenceIdMethod($this->mgConfig->id) == ReferenceIdEnum::Sequence) {
       $IdService = new \App\Lib\Identifier\Sequence;

diff --git a/app/src/Lib/Traits/MatchgridLinkTrait.php b/app/src/Lib/Traits/MatchgridLinkTrait.php
@@ -79,8 +79,8 @@ public function calculateMatchgridId(int $id) {
         // Look up $linkAttr to get its Matchgrid. We currently assume only
         // one level of nesting.
 
-        $linkTable = FactoryLocator::get($this->getPrimaryLinkTableName());
-        
+        $linkTable = FactoryLocator::get('Table')->get($this->getPrimaryLinkTableName());
+
         return $linkTable->calculateMatchgridId($obj->$linkAttr);
       }
     }