From e57aae3a21366a7c25e6bdf6a966748ebe9d0269 Mon Sep 17 00:00:00 2001
From: Quentin RIBAC <quentin.ribac@xelians.fr>
Date: Mon, 27 Sep 2021 14:55:09 +0200
Subject: [PATCH] FEAT #18096 TIME 0:15 change column names (back)
---
src/app/entity/controllers/EntityController.php | 4 ++--
src/core/models/TextFormatModel.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/entity/controllers/EntityController.php b/src/app/entity/controllers/EntityController.php
index 898972b4829..284f0cfa53c 100755
--- a/src/app/entity/controllers/EntityController.php
+++ b/src/app/entity/controllers/EntityController.php
@@ -556,8 +556,8 @@ class EntityController
}
$allowedFields = [
- 'id', 'entityId', 'entityLabel', 'shortLabel', 'entityFullName', 'enabled', 'addressNumber', 'addressStreet', 'addressAdditional1', 'addressAdditional2',
- 'addressPostcode', 'addressTown', 'addressCountry', 'email', 'parentEntityId', 'entityType', 'businessId', 'folderImport', 'producerService',
+ 'id', 'entityId', 'entityLabel', 'shortLabel', 'entityFullName', 'enabled', 'adrs_1', 'adrs_2', 'adrs_3', 'zipcode', 'city', 'country',
+ 'email', 'parentEntityId', 'entityType', 'businessId', 'folderImport', 'producerService',
'diffusionList', 'visaCircuit', 'opinionCircuit',
'users',
'templates'
diff --git a/src/core/models/TextFormatModel.php b/src/core/models/TextFormatModel.php
index 1be51a155d5..f61d4da5327 100755
--- a/src/core/models/TextFormatModel.php
+++ b/src/core/models/TextFormatModel.php
@@ -131,7 +131,7 @@ class TextFormatModel
public static function camelToSnake($subject) {
$snakeCaseSubject = '';
foreach (str_split($subject) as $index => $character) {
- if ($index > 0 && strtoupper($character) == $character && strpos('0123456789', $character) === false) {
+ if ($index > 0 && strtoupper($character) == $character && strpos('0123456789_', $character) === false) {
$character = strtolower($character);
$character = '_' . $character;
}
--
GitLab