joomla/Component-Builder
joomla/Component-Builder
39
23
Fork 11
Code Issues 83 Pull Requests Projects 4 Wiki Activity

Added InoDB options, Expanded the Custom Field #350

Merged
Llewellyn merged 13 commits from staging into master 2018-10-07 19:47:50 +00:00
Conversation 0 Commits 13 Files Changed 146 +140 -122
4 changed files with 140 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95b6a23159 - Show all commits

2
README.md
View File

@ -125,7 +125,7 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 3rd October, 2018
+ *Last Build*: 4th October, 2018
+ *Version*: 2.9.6
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt

2
admin/README.txt
View File

@ -125,7 +125,7 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015
+ *Last Build*: 3rd October, 2018
+ *Last Build*: 4th October, 2018
+ *Version*: 2.9.6
+ *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt

18
admin/helpers/compiler/a_Get.php
View File

@ -3000,6 +3000,8 @@ class Get
// reset buckets
$result->main_get = array();
$result->custom_get = array();
// should joineds and other weaks be added
$addDynamicTweaksJoints = true;
// set source data
switch ($result->main_source)
{
@ -3044,8 +3046,13 @@ class Get
$result->main_get[0]['as'] = 'a';
$result->main_get[0]['key'] = $result->key;
$result->main_get[0]['context'] = $context;
// do not add
$addDynamicTweaksJoints = false;
break;
}
// only add if main source is not custom
if ($addDynamicTweaksJoints)
{
// set join_view_table details
$result->join_view_table = json_decode($result->join_view_table, true);
if (ComponentbuilderHelper::checkArray($result->join_view_table))
@ -3189,6 +3196,17 @@ class Get
{
unset($result->global);
}
}
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->order);
unset($result->global);
}
// load the events if any is set
if ($result->gettype == 1 && ComponentbuilderHelper::checkJson($result->plugin_events))
{

2
componentbuilder.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="3.2" method="upgrade">
<name>COM_COMPONENTBUILDER</name>
<creationDate>3rd October, 2018</creationDate>
<creationDate>4th October, 2018</creationDate>
<author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>