vincent.tisseyre/enedis_carto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

carto_J5 to main #1

Merged
vincent.tisseyre merged 15 commits from carto_J5 into main 2024-11-12 12:53:09 +01:00
Conversation 0 Commits 15 Files Changed 343 +7 -6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1fec90b18 - Show all commits

13
com_leaflet/site/src/Model/LeafletModel.php
View File

@ -50,7 +50,7 @@ class LeafletModel extends ItemModel {
{ {
try try
{ {
$db = Factory::getDbo(); $db = Factory::getContainer()->get('DatabaseDriver');
$query = $db $query = $db
->getQuery(true) ->getQuery(true)
->select('id') ->select('id')
@ -79,7 +79,7 @@ class LeafletModel extends ItemModel {
{ {
try try
{ {
$db = Factory::getDbo(); $db = Factory::getContainer()->get('DatabaseDriver');
$query = $db->getQuery(true); $query = $db->getQuery(true);
$query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams')));
@ -102,7 +102,7 @@ class LeafletModel extends ItemModel {
{ {
try try
{ {
$db = Factory::getDbo(); $db = Factory::getContainer()->get('DatabaseDriver');
$query = $db->getQuery(true); $query = $db->getQuery(true);
$query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams')));
@ -127,7 +127,7 @@ class LeafletModel extends ItemModel {
{ {
try try
{ {
$db = Factory::getDbo(); $db = Factory::getContainer()->get('DatabaseDriver');
$query = $db->getQuery(true); $query = $db->getQuery(true);
$query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams'))); $query->select($db->quoteName(array('id', 'title', 'name', 'fieldparams')));
@ -152,7 +152,7 @@ class LeafletModel extends ItemModel {
{ {
try try
{ {
$db = Factory::getDbo(); $db = Factory::getContainer()->get('DatabaseDriver');
$query = $db->getQuery(true); $query = $db->getQuery(true);
$groupId = 4; $groupId = 4;
@ -171,6 +171,7 @@ class LeafletModel extends ItemModel {
'c.title', 'c.title',
'c.alias', 'c.alias',
'c.state', 'c.state',
'c.catid',
'c.introtext'); 'c.introtext');
foreach($fields as $field) { foreach($fields as $field) {
array_push($fieldsSelect, 'GROUP_CONCAT(DISTINCT IF(field_id = ' . $field->id . ', value, NULL) SEPARATOR ",") AS ' . $field->name); array_push($fieldsSelect, 'GROUP_CONCAT(DISTINCT IF(field_id = ' . $field->id . ', value, NULL) SEPARATOR ",") AS ' . $field->name);
@ -205,4 +206,4 @@ class LeafletModel extends ItemModel {
return $results; return $results;
} }
} }