Merge branch 'hotfix_#1005_delete_empty_items' into hotfix/2.0.0-alpha16

* hotfix_#1005_delete_empty_items: Hotfix #1005 delete empty items # Conflicts: # src/MetaModels/Attribute/TranslatedReference.php
MetaModels · Aug 24, 2017 · 76e6216 · 76e6216
2 parents 8553915 + 56e3623
commit 76e6216
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/src/MetaModels/Attribute/TranslatedReference.php b/src/MetaModels/Attribute/TranslatedReference.php
@@ -322,19 +322,30 @@ public function setTranslatedDataFor($arrValues, $strLangCode)
         $arrExisting = array_keys($this->getTranslatedDataFor($arrIds, $strLangCode));
         $arrNewIds   = array_diff($arrIds, $arrExisting);
 
-        // Update existing values.
-        $strQuery = 'UPDATE ' . $this->getValueTable() . ' %s';
+        // Update existing values - delete if empty.
+        $strQueryUpdate = 'UPDATE ' . $this->getValueTable() . ' %s';
+        $strQueryDelete = 'DELETE FROM ' . $this->getValueTable();
+
         foreach ($arrExisting as $intId) {
             $arrWhere = $this->getWhere($intId, $strLangCode);
-            $objDB->prepare($strQuery . ($arrWhere ? ' WHERE ' . $arrWhere['procedure'] : ''))
-                ->set($this->getSetValues($arrValues[$intId], $intId, $strLangCode))
-                ->execute(($arrWhere ? $arrWhere['params'] : null));
+
+            if ($arrValues[$intId]['value'] != '') {
+                $objDB->prepare($strQueryUpdate . ($arrWhere ? ' WHERE ' . $arrWhere['procedure'] : ''))
+                    ->set($this->getSetValues($arrValues[$intId], $intId, $strLangCode))
+                    ->execute(($arrWhere ? $arrWhere['params'] : null));
+            } else {
+                $objDB->prepare($strQueryDelete . ($arrWhere ? ' WHERE ' . $arrWhere['procedure'] : ''))
+                    ->execute(($arrWhere ? $arrWhere['params'] : null));
+            }
         }
 
         // Insert the new values.
-        $strQuery = 'INSERT INTO ' . $this->getValueTable() . ' %s';
+        $strQueryInsert = 'INSERT INTO ' . $this->getValueTable() . ' %s';
         foreach ($arrNewIds as $intId) {
-            $objDB->prepare($strQuery)
+            if ($arrValues[$intId]['value'] == '') {
+                continue;
+            }
+            $objDB->prepare($strQueryInsert)
                 ->set($this->getSetValues($arrValues[$intId], $intId, $strLangCode))
                 ->execute();
         }