diff --git a/migration/19.12/migrateCustomFields.php b/migration/19.12/migrateCustomFields.php index de57ab6cdc3ba18cd5c93c855eedf52cde0720d1..c510c062f5b23cba9dcfa7f38c8cc926deea4e01 100644 --- a/migration/19.12/migrateCustomFields.php +++ b/migration/19.12/migrateCustomFields.php @@ -12,6 +12,11 @@ foreach ($customs as $custom) { continue; } + \SrcCore\models\DatabasePDO::reset(); + new \SrcCore\models\DatabasePDO(['customId' => $custom]); + + \CustomField\models\CustomFieldModel::delete(['where' => ['1=1']]); + $natures = []; $migrated = 0; $path = "custom/{$custom}/apps/maarch_entreprise/xml/index_letterbox.xml"; diff --git a/src/app/customField/models/CustomFieldModel.php b/src/app/customField/models/CustomFieldModel.php index 66b31c5ac2e8be86b2a6c9aba0599d4ff3a3c409..81d7e6d8b4c9d891b74e359f1daa2460b8a3333c 100644 --- a/src/app/customField/models/CustomFieldModel.php +++ b/src/app/customField/models/CustomFieldModel.php @@ -93,13 +93,13 @@ class CustomFieldModel public static function delete(array $args) { - ValidatorModel::notEmpty($args, ['where', 'data']); + ValidatorModel::notEmpty($args, ['where']); ValidatorModel::arrayType($args, ['where', 'data']); DatabaseModel::delete([ 'table' => 'custom_fields', 'where' => $args['where'], - 'data' => $args['data'] + 'data' => $args['data'] ?? [] ]); return true;