Fixed gh-349 to insure dynamic joined and other tweaks are not added when custom code is selected as main source with a dynamicGet
This commit is contained in:
parent
feb4ae9c24
commit
95b6a23159
@ -125,7 +125,7 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
|
|||||||
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
||||||
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
||||||
+ *First Build*: 30th April, 2015
|
+ *First Build*: 30th April, 2015
|
||||||
+ *Last Build*: 3rd October, 2018
|
+ *Last Build*: 4th October, 2018
|
||||||
+ *Version*: 2.9.6
|
+ *Version*: 2.9.6
|
||||||
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
|
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
|
||||||
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
|
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
|
||||||
|
|||||||
@ -125,7 +125,7 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
|
|||||||
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
|
||||||
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
|
||||||
+ *First Build*: 30th April, 2015
|
+ *First Build*: 30th April, 2015
|
||||||
+ *Last Build*: 3rd October, 2018
|
+ *Last Build*: 4th October, 2018
|
||||||
+ *Version*: 2.9.6
|
+ *Version*: 2.9.6
|
||||||
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
|
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
|
||||||
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
|
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt
|
||||||
|
|||||||
@ -3000,6 +3000,8 @@ class Get
|
|||||||
// reset buckets
|
// reset buckets
|
||||||
$result->main_get = array();
|
$result->main_get = array();
|
||||||
$result->custom_get = array();
|
$result->custom_get = array();
|
||||||
|
// should joineds and other weaks be added
|
||||||
|
$addDynamicTweaksJoints = true;
|
||||||
// set source data
|
// set source data
|
||||||
switch ($result->main_source)
|
switch ($result->main_source)
|
||||||
{
|
{
|
||||||
@ -3044,149 +3046,165 @@ class Get
|
|||||||
$result->main_get[0]['as'] = 'a';
|
$result->main_get[0]['as'] = 'a';
|
||||||
$result->main_get[0]['key'] = $result->key;
|
$result->main_get[0]['key'] = $result->key;
|
||||||
$result->main_get[0]['context'] = $context;
|
$result->main_get[0]['context'] = $context;
|
||||||
|
// do not add
|
||||||
|
$addDynamicTweaksJoints = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// set join_view_table details
|
// only add if main source is not custom
|
||||||
$result->join_view_table = json_decode($result->join_view_table, true);
|
if ($addDynamicTweaksJoints)
|
||||||
if (ComponentbuilderHelper::checkArray($result->join_view_table))
|
|
||||||
{
|
{
|
||||||
foreach ($result->join_view_table as $nr => &$option)
|
// set join_view_table details
|
||||||
|
$result->join_view_table = json_decode($result->join_view_table, true);
|
||||||
|
if (ComponentbuilderHelper::checkArray($result->join_view_table))
|
||||||
{
|
{
|
||||||
if (ComponentbuilderHelper::checkString($option['selection']))
|
foreach ($result->join_view_table as $nr => &$option)
|
||||||
{
|
{
|
||||||
// convert the type
|
if (ComponentbuilderHelper::checkString($option['selection']))
|
||||||
$option['type'] = $typeArray[$option['type']];
|
|
||||||
// convert the operator
|
|
||||||
$option['operator'] = $operatorArray[$option['operator']];
|
|
||||||
// get the on field values
|
|
||||||
$on_field = array(); // array(on_field_as, on_field)
|
|
||||||
$on_field = array_map('trim', explode('.', $option['on_field']));
|
|
||||||
// get the join field values
|
|
||||||
$join_field = array(); // array(join_field_as, join_field)
|
|
||||||
$join_field = array_map('trim', explode('.', $option['join_field']));
|
|
||||||
$option['selection'] = $this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
|
|
||||||
$option['key'] = $result->key;
|
|
||||||
$option['context'] = $context;
|
|
||||||
// load to the getters
|
|
||||||
if ($option['row_type'] == 1)
|
|
||||||
{
|
{
|
||||||
$result->main_get[] = $option;
|
// convert the type
|
||||||
if ($on_field[0] === 'a')
|
$option['type'] = $typeArray[$option['type']];
|
||||||
|
// convert the operator
|
||||||
|
$option['operator'] = $operatorArray[$option['operator']];
|
||||||
|
// get the on field values
|
||||||
|
$on_field = array(); // array(on_field_as, on_field)
|
||||||
|
$on_field = array_map('trim', explode('.', $option['on_field']));
|
||||||
|
// get the join field values
|
||||||
|
$join_field = array(); // array(join_field_as, join_field)
|
||||||
|
$join_field = array_map('trim', explode('.', $option['join_field']));
|
||||||
|
$option['selection'] = $this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
|
||||||
|
$option['key'] = $result->key;
|
||||||
|
$option['context'] = $context;
|
||||||
|
// load to the getters
|
||||||
|
if ($option['row_type'] == 1)
|
||||||
{
|
{
|
||||||
$this->siteMainGet[$this->target][$view_code][$option['as']] = $option['as'];
|
$result->main_get[] = $option;
|
||||||
|
if ($on_field[0] === 'a')
|
||||||
|
{
|
||||||
|
$this->siteMainGet[$this->target][$view_code][$option['as']] = $option['as'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
elseif ($option['row_type'] == 2)
|
||||||
{
|
{
|
||||||
$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
|
$result->custom_get[] = $option;
|
||||||
|
if ($on_field[0] != 'a')
|
||||||
|
{
|
||||||
|
$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elseif ($option['row_type'] == 2)
|
unset($result->join_view_table[$nr]);
|
||||||
{
|
|
||||||
$result->custom_get[] = $option;
|
|
||||||
if ($on_field[0] != 'a')
|
|
||||||
{
|
|
||||||
$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($result->join_view_table[$nr]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($result->join_view_table);
|
|
||||||
// set join_db_table details
|
|
||||||
$result->join_db_table = json_decode($result->join_db_table, true);
|
|
||||||
if (ComponentbuilderHelper::checkArray($result->join_db_table))
|
|
||||||
{
|
|
||||||
foreach ($result->join_db_table as $nr => &$option1)
|
|
||||||
{
|
|
||||||
if (ComponentbuilderHelper::checkString($option1['selection']))
|
|
||||||
{
|
|
||||||
// convert the type
|
|
||||||
$option1['type'] = $typeArray[$option1['type']];
|
|
||||||
// convert the operator
|
|
||||||
$option1['operator'] = $operatorArray[$option1['operator']];
|
|
||||||
// get the on field values
|
|
||||||
$on_field = array(); // array(on_field_as, on_field)
|
|
||||||
$on_field = array_map('trim', explode('.', $option1['on_field']));
|
|
||||||
// get the join field values
|
|
||||||
$join_field = array(); // array(join_field_as, join_field)
|
|
||||||
$join_field = array_map('trim', explode('.', $option1['join_field']));
|
|
||||||
$option1['selection'] = $this->setDataSelection($result->key, $view_code, $option1['selection'], $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
|
|
||||||
$option1['key'] = $result->key;
|
|
||||||
$option1['context'] = $context;
|
|
||||||
// load to the getters
|
|
||||||
if ($option1['row_type'] == 1)
|
|
||||||
{
|
|
||||||
$result->main_get[] = $option1;
|
|
||||||
if ($on_field[0] === 'a')
|
|
||||||
{
|
|
||||||
$this->siteMainGet[$this->target][$view_code][$option1['as']] = $option1['as'];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
elseif ($option1['row_type'] == 2)
|
|
||||||
{
|
|
||||||
$result->custom_get[] = $option1;
|
|
||||||
if ($on_field[0] != 'a')
|
|
||||||
{
|
|
||||||
$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($result->join_db_table[$nr]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($result->join_db_table);
|
|
||||||
// set filter details
|
|
||||||
$result->filter = json_decode($result->filter, true);
|
|
||||||
if (ComponentbuilderHelper::checkArray($result->filter))
|
|
||||||
{
|
|
||||||
foreach ($result->filter as $nr => &$option2)
|
|
||||||
{
|
|
||||||
if (isset($option2['operator']))
|
|
||||||
{
|
|
||||||
$option2['operator'] = $operatorArray[$option2['operator']];
|
|
||||||
$option2['key'] = $result->key;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unset($result->filter[$nr]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
unset($result->join_view_table);
|
||||||
// set where details
|
// set join_db_table details
|
||||||
$result->where = json_decode($result->where, true);
|
$result->join_db_table = json_decode($result->join_db_table, true);
|
||||||
if (ComponentbuilderHelper::checkArray($result->where))
|
if (ComponentbuilderHelper::checkArray($result->join_db_table))
|
||||||
{
|
|
||||||
foreach ($result->where as $nr => &$option3)
|
|
||||||
{
|
{
|
||||||
if (isset($option3['operator']))
|
foreach ($result->join_db_table as $nr => &$option1)
|
||||||
{
|
{
|
||||||
$option3['operator'] = $operatorArray[$option3['operator']];
|
if (ComponentbuilderHelper::checkString($option1['selection']))
|
||||||
|
{
|
||||||
|
// convert the type
|
||||||
|
$option1['type'] = $typeArray[$option1['type']];
|
||||||
|
// convert the operator
|
||||||
|
$option1['operator'] = $operatorArray[$option1['operator']];
|
||||||
|
// get the on field values
|
||||||
|
$on_field = array(); // array(on_field_as, on_field)
|
||||||
|
$on_field = array_map('trim', explode('.', $option1['on_field']));
|
||||||
|
// get the join field values
|
||||||
|
$join_field = array(); // array(join_field_as, join_field)
|
||||||
|
$join_field = array_map('trim', explode('.', $option1['join_field']));
|
||||||
|
$option1['selection'] = $this->setDataSelection($result->key, $view_code, $option1['selection'], $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
|
||||||
|
$option1['key'] = $result->key;
|
||||||
|
$option1['context'] = $context;
|
||||||
|
// load to the getters
|
||||||
|
if ($option1['row_type'] == 1)
|
||||||
|
{
|
||||||
|
$result->main_get[] = $option1;
|
||||||
|
if ($on_field[0] === 'a')
|
||||||
|
{
|
||||||
|
$this->siteMainGet[$this->target][$view_code][$option1['as']] = $option1['as'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
elseif ($option1['row_type'] == 2)
|
||||||
|
{
|
||||||
|
$result->custom_get[] = $option1;
|
||||||
|
if ($on_field[0] != 'a')
|
||||||
|
{
|
||||||
|
$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
unset($result->join_db_table[$nr]);
|
||||||
}
|
}
|
||||||
else
|
}
|
||||||
|
unset($result->join_db_table);
|
||||||
|
// set filter details
|
||||||
|
$result->filter = json_decode($result->filter, true);
|
||||||
|
if (ComponentbuilderHelper::checkArray($result->filter))
|
||||||
|
{
|
||||||
|
foreach ($result->filter as $nr => &$option2)
|
||||||
{
|
{
|
||||||
unset($result->where[$nr]);
|
if (isset($option2['operator']))
|
||||||
|
{
|
||||||
|
$option2['operator'] = $operatorArray[$option2['operator']];
|
||||||
|
$option2['key'] = $result->key;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unset($result->filter[$nr]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// set where details
|
||||||
|
$result->where = json_decode($result->where, true);
|
||||||
|
if (ComponentbuilderHelper::checkArray($result->where))
|
||||||
|
{
|
||||||
|
foreach ($result->where as $nr => &$option3)
|
||||||
|
{
|
||||||
|
if (isset($option3['operator']))
|
||||||
|
{
|
||||||
|
$option3['operator'] = $operatorArray[$option3['operator']];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unset($result->where[$nr]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unset($result->where);
|
||||||
|
}
|
||||||
|
// set order details
|
||||||
|
$result->order = json_decode($result->order, true);
|
||||||
|
if (!ComponentbuilderHelper::checkArray($result->order))
|
||||||
|
{
|
||||||
|
unset($result->order);
|
||||||
|
}
|
||||||
|
// set global details
|
||||||
|
$result->global = json_decode($result->global, true);
|
||||||
|
if (!ComponentbuilderHelper::checkArray($result->global))
|
||||||
|
{
|
||||||
|
unset($result->global);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// when we have a custom query script we do not add the dynamic options
|
||||||
|
unset($result->join_view_table);
|
||||||
|
unset($result->join_db_table);
|
||||||
|
unset($result->filter);
|
||||||
unset($result->where);
|
unset($result->where);
|
||||||
}
|
|
||||||
// set order details
|
|
||||||
$result->order = json_decode($result->order, true);
|
|
||||||
if (!ComponentbuilderHelper::checkArray($result->order))
|
|
||||||
{
|
|
||||||
unset($result->order);
|
unset($result->order);
|
||||||
}
|
|
||||||
// set global details
|
|
||||||
$result->global = json_decode($result->global, true);
|
|
||||||
if (!ComponentbuilderHelper::checkArray($result->global))
|
|
||||||
{
|
|
||||||
unset($result->global);
|
unset($result->global);
|
||||||
}
|
}
|
||||||
// load the events if any is set
|
// load the events if any is set
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<extension type="component" version="3.2" method="upgrade">
|
<extension type="component" version="3.2" method="upgrade">
|
||||||
<name>COM_COMPONENTBUILDER</name>
|
<name>COM_COMPONENTBUILDER</name>
|
||||||
<creationDate>3rd October, 2018</creationDate>
|
<creationDate>4th October, 2018</creationDate>
|
||||||
<author>Llewellyn van der Merwe</author>
|
<author>Llewellyn van der Merwe</author>
|
||||||
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
|
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
|
||||||
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
|
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user