fixes

OnePlc · Mar 4, 2020 · ce00716 · ce00716
1 parent 71b708a
commit ce00716
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/module/Application/src/Model/CoreEntityModel.php b/module/Application/src/Model/CoreEntityModel.php
@@ -210,7 +210,16 @@ public function getMultiSelectFieldIDs($sField) {
             $sEntityType = explode('-',$this->sSingleForm)[0];
             $aFieldIDs = [];
 
-            $oTag = CoreController::$aCoreTables['core-tag']->select(['tag_key'=>$oField->tag_key]);
+            $sTagKey = $oField->tag_key;
+            $bIsIDFS = stripos($sTagKey,'_idfs');
+            if($bIsIDFS === false) {
+
+            } else {
+                # its a like
+                $sTagKey = substr($sTagKey,0,strlen('_idfs'));
+            }
+
+            $oTag = CoreController::$aCoreTables['core-tag']->select(['tag_key'=>$sTagKey]);
             if(count($oTag) > 0) {
                 $oTag = $oTag->current();
 
@@ -228,8 +237,6 @@ public function getMultiSelectFieldIDs($sField) {
                         $aFieldIDs[] = $oEntityTag->entity_tag_idfs;
                     }
                 }
-            } else {
-                echo 'tag '.$oField->fieldkey.' not found';
             }
 
             return $aFieldIDs;

diff --git a/module/Application/src/Model/CoreEntityTable.php b/module/Application/src/Model/CoreEntityTable.php
@@ -211,6 +211,9 @@ public function saveSingleEntity($oSkeleton,$sIDKey = 'Skeleton_ID',$aDefaultDat
             'label' => $oSkeleton->label,
         ];
 
+        if(count($aDefaultData) > 0) {
+            $aData = $aDefaultData;
+        }
         $aData = $this->attachDynamicFields($aData,$oSkeleton);
 
         $id = (int) $oSkeleton->id;

diff --git a/module/Application/view/application/index/checkforupdates.phtml b/module/Application/view/application/index/checkforupdates.phtml
@@ -79,6 +79,7 @@ use Application\Controller\CoreController;
                                     $sUrl = '';
                                     try {
                                         $sModRoute = substr($sModName,strlen($aVendors[0].'-'));
+                                        echo $sModRoute.'-setup';
                                         $sUrl = $this->url($sModRoute.'-setup');
                                     } catch(\RuntimeException $e) {