Resolved gh-404 by adding the option to use grouping in dynamicGet query.

README.md

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.14) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.15) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -146,13 +146,13 @@ TODO
 + *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*: 4th April, 2019
++ *Last Build*: 9th April, 2019
-+ *Version*: 2.9.14
++ *Version*: 2.9.15
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **203650**
++ *Line count*: **203724**
-+ *Field count*: **1114**
++ *Field count*: **1116**
-+ *File count*: **1337**
++ *File count*: **1338**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.14) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.15) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -146,13 +146,13 @@ TODO
 + *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*: 4th April, 2019
++ *Last Build*: 9th April, 2019
-+ *Version*: 2.9.14
++ *Version*: 2.9.15
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **203650**
++ *Line count*: **203724**
-+ *Field count*: **1114**
++ *Field count*: **1116**
-+ *File count*: **1337**
++ *File count*: **1338**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/helpers/compiler/a_Get.php

@@ -3283,6 +3283,12 @@ class Get
 							{
 								unset($result->order);
 							}
+							// set grouping
+							$result->group = json_decode($result->group, true);
+							if (!ComponentbuilderHelper::checkArray($result->group))
+							{
+								unset($result->group);
+							}
 							// set global details
 							$result->global = json_decode($result->global, true);
 							if (!ComponentbuilderHelper::checkArray($result->global))
@@ -3298,6 +3304,7 @@ class Get
 							unset($result->filter);
 							unset($result->where);
 							unset($result->order);
+							unset($result->group);
 							unset($result->global);
 						}
 						// load the events if any is set

admin/helpers/compiler/e_Interpretation.php

@@ -2067,6 +2067,30 @@ class Interpretation extends Fields
 		return $filters;
 	}
 
+	public function setCustomViewGroup(&$group, &$code, $tab = '')
+	{
+		$grouping = '';
+		if (ComponentbuilderHelper::checkArray($group))
+		{
+			foreach ($group as $gr)
+			{
+				list($as, $field) = array_map('trim', explode('.', $gr['table_key']));
+				// set the string
+				$string = "\$query->group('" . $gr['table_key'] . "');";
+				// sort where
+				if ($as === 'a' || (isset($this->siteMainGet[$this->target][$code][$as]) && ComponentbuilderHelper::checkString($this->siteMainGet[$this->target][$code][$as])))
+				{
+					$grouping .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . $string;
+				}
+				else
+				{
+					$this->otherGroup[$this->target][$code][$as][$field] = PHP_EOL . $this->_t(2) . $string;
+				}
+			}
+		}
+		return $grouping;
+	}
+
 	public function setCustomViewOrder(&$order, &$code, $tab = '')
 	{
 		$ordering = '';
@@ -2313,11 +2337,25 @@ class Interpretation extends Fields
 			// set main get query
 			$getItem .= $this->setCustomViewQuery($get->main_get, $code, $tab);
 			// setup filters
-			$getItem .= $this->setCustomViewFilter($get->filter, $code, $tab);
+			if (isset($get->filter))
+			{
+				$getItem .= $this->setCustomViewFilter($get->filter, $code, $tab);
+			}
 			// setup Where
-			$getItem .= $this->setCustomViewWhere($get->where, $code, $tab);
+			if (isset($get->where))
+			{
+				$getItem .= $this->setCustomViewWhere($get->where, $code, $tab);
+			}
 			// setup ordering
-			$getItem .= $this->setCustomViewOrder($get->order, $code, $tab);
+			if (isset($get->order))
+			{
+				$getItem .= $this->setCustomViewOrder($get->order, $code, $tab);
+			}
+			// setup grouping
+			if (isset($get->group))
+			{
+				$getItem .= $this->setCustomViewGroup($get->group, $code, $tab);
+			}
 			// get ready to get query
 			$getItem .= PHP_EOL . PHP_EOL . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Reset the query using our newly populated query object.";
 			$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$db->setQuery(\$query);";
@@ -2798,6 +2836,14 @@ class Interpretation extends Fields
 								$methods .= $string;
 							}
 						}
+						// add any other grouping that was set
+						if (isset($this->otherGroup[$this->target][$default['code']][$default['as']]) && ComponentbuilderHelper::checkArray($this->otherGroup[$this->target][$default['code']][$default['as']]))
+						{
+							foreach ($this->otherGroup[$this->target][$default['code']][$default['as']] as $field => $string)
+							{
+								$methods .= $string;
+							}
+						}
 						$methods .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Reset the query using our newly populated query object.";
 						$methods .= PHP_EOL . $this->_t(2) . "\$db->setQuery(\$query);";
 						$methods .= PHP_EOL . $this->_t(2) . "\$db->execute();";
@@ -3031,11 +3077,25 @@ class Interpretation extends Fields
 			// set main get query
 			$getItem .= $this->setCustomViewQuery($get->main_get, $code);
 			// setup filters
-			$getItem .= $this->setCustomViewFilter($get->filter, $code);
+			if (isset($get->filter))
+			{
+				$getItem .= $this->setCustomViewFilter($get->filter, $code);
+			}
 			// setup where
-			$getItem .= $this->setCustomViewWhere($get->where, $code);
+			if (isset($get->where))
+			{
+				$getItem .= $this->setCustomViewWhere($get->where, $code);
+			}
 			// setup ordering
-			$getItem .= $this->setCustomViewOrder($get->order, $code);
+			if (isset($get->order))
+			{
+				$getItem .= $this->setCustomViewOrder($get->order, $code);
+			}
+			// setup grouping
+			if (isset($get->group))
+			{
+				$getItem .= $this->setCustomViewGroup($get->group, $code);
+			}
 			if ($return)
 			{
 				// return the query object

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -4018,6 +4018,9 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_DESCRIPTION="Here you can add global var
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_LABEL="Set Global"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN="greater than"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL="greater than or equal"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP="Group"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP_DESCRIPTION="Here you can set the grouping per data set."
+COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP_LABEL="Grouping"
 COM_COMPONENTBUILDER_DYNAMIC_GET_H="h"
 COM_COMPONENTBUILDER_DYNAMIC_GET_HH="hh"
 COM_COMPONENTBUILDER_DYNAMIC_GET_I="i"
@@ -4169,7 +4172,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags"
 COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TWEAK="Tweak"
-COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"

admin/layouts/dynamic_get/tweak_fullwidth.php

@@ -18,6 +18,7 @@ $fields = $displayData->get('fields') ?: array(
 	'filter',
 	'where',
 	'order',
+	'group',
 	'global'
 );
 

admin/models/dynamic_get.php

@@ -134,6 +134,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->php_calculation = base64_decode($item->php_calculation);
 			}
 
+			if (!empty($item->join_view_table))
+			{
+				// Convert the join_view_table field to an array.
+				$join_view_table = new Registry;
+				$join_view_table->loadString($item->join_view_table);
+				$item->join_view_table = $join_view_table->toArray();
+			}
+
 			if (!empty($item->join_db_table))
 			{
 				// Convert the join_db_table field to an array.
@@ -166,6 +174,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->order = $order->toArray();
 			}
 
+			if (!empty($item->group))
+			{
+				// Convert the group field to an array.
+				$group = new Registry;
+				$group->loadString($item->group);
+				$item->group = $group->toArray();
+			}
+
 			if (!empty($item->global))
 			{
 				// Convert the global field to an array.
@@ -174,14 +190,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->global = $global->toArray();
 			}
 
-			if (!empty($item->join_view_table))
-			{
-				// Convert the join_view_table field to an array.
-				$join_view_table = new Registry;
-				$join_view_table->loadString($item->join_view_table);
-				$item->join_view_table = $join_view_table->toArray();
-			}
-
 			if (!empty($item->plugin_events))
 			{
 				// JSON Decode plugin_events.
@@ -986,6 +994,19 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		}
 
+		// Set the join_view_table items to data.
+		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
+		{
+			$join_view_table = new JRegistry;
+			$join_view_table->loadArray($data['join_view_table']);
+			$data['join_view_table'] = (string) $join_view_table;
+		}
+		elseif (!isset($data['join_view_table']))
+		{
+			// Set the empty join_view_table to data
+			$data['join_view_table'] = '';
+		}
+
 		// Set the join_db_table items to data.
 		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
 		{
@@ -1038,6 +1059,19 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['order'] = '';
 		}
 
+		// Set the group items to data.
+		if (isset($data['group']) && is_array($data['group']))
+		{
+			$group = new JRegistry;
+			$group->loadArray($data['group']);
+			$data['group'] = (string) $group;
+		}
+		elseif (!isset($data['group']))
+		{
+			// Set the empty group to data
+			$data['group'] = '';
+		}
+
 		// Set the global items to data.
 		if (isset($data['global']) && is_array($data['global']))
 		{
@@ -1051,19 +1085,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['global'] = '';
 		}
 
-		// Set the join_view_table items to data.
-		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
-		{
-			$join_view_table = new JRegistry;
-			$join_view_table->loadArray($data['join_view_table']);
-			$data['join_view_table'] = (string) $join_view_table;
-		}
-		elseif (!isset($data['join_view_table']))
-		{
-			// Set the empty join_view_table to data
-			$data['join_view_table'] = '';
-		}
-
 		// Set the plugin_events string to JSON string.
 		if (isset($data['plugin_events']))
 		{

admin/models/forms/dynamic_get.js

@@ -657,6 +657,7 @@ function vvvvvzp(main_source_vvvvvzp)
 	{
 		jQuery('#jform_filter-lbl').closest('.control-group').show();
 		jQuery('#jform_global-lbl').closest('.control-group').show();
+		jQuery('#jform_group-lbl').closest('.control-group').show();
 		jQuery('#jform_order-lbl').closest('.control-group').show();
 		jQuery('#jform_where-lbl').closest('.control-group').show();
 		jQuery('#jform_join_db_table-lbl').closest('.control-group').show();
@@ -666,6 +667,7 @@ function vvvvvzp(main_source_vvvvvzp)
 	{
 		jQuery('#jform_filter-lbl').closest('.control-group').hide();
 		jQuery('#jform_global-lbl').closest('.control-group').hide();
+		jQuery('#jform_group-lbl').closest('.control-group').hide();
 		jQuery('#jform_order-lbl').closest('.control-group').hide();
 		jQuery('#jform_where-lbl').closest('.control-group').hide();
 		jQuery('#jform_join_db_table-lbl').closest('.control-group').hide();

admin/models/forms/dynamic_get.xml

@@ -143,6 +143,16 @@
 			<option value="4">
 				COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOMS</option>
 		</field>
+		<!-- View_table_main Field. Type: Adminviews. (custom) -->
+		<field
+			type="adminviews"
+			name="view_table_main"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
+			description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
+			multiple="false"
+			default=""
+			required="true"
+		/>
 		<!-- Addcalculation Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -189,20 +199,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
 		</field>
-		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
+		<!-- View_selection Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
+			type="textarea"
-			name="add_php_getlistquery"
+			name="view_selection"
-			label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_GETLISTQUERY_LABEL"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL"
-			class="btn-group btn-group-yesno"
+			rows="22"
-			default="0"
+			cols="30"
-			required="true">
+			description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_DESCRIPTION"
-			<!-- Option Set. -->
+			class="text_area span12"
-			<option value="1">
+			filter="HTML"
-				COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
+			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_HINT"
-			<option value="0">
+			required="true"
-				COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
+		/>
-		</field>
 		<!-- Add_php_before_getitems Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -231,19 +240,20 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
 		</field>
-		<!-- View_selection Field. Type: Textarea. (joomla) -->
+		<!-- Add_php_after_getitem Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
+			type="radio"
-			name="view_selection"
+			name="add_php_after_getitem"
-			label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_AFTER_GETITEM_LABEL"
-			rows="22"
+			class="btn-group btn-group-yesno"
-			cols="30"
+			default="0"
-			description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_DESCRIPTION"
+			required="true">
-			class="text_area span12"
+			<!-- Option Set. -->
-			filter="HTML"
+			<option value="1">
-			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_HINT"
+				COM_COMPONENTBUILDER_DYNAMIC_GET_YES</option>
-			required="true"
+			<option value="0">
-		/>
+				COM_COMPONENTBUILDER_DYNAMIC_GET_NO</option>
+		</field>
 		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
 		<!-- Db_table_main Field. Type: Dbtables. (custom) -->
@@ -303,21 +313,267 @@
 			hint="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_SELECTION_HINT"
 			required="true"
 		/>
-		<!-- View_table_main Field. Type: Adminviews. (custom) -->
+		<!-- Join_view_table Field. Type: Subform. (joomla) -->
 		<field
-			type="adminviews"
+			type="subform"
-			name="view_table_main"
+			name="join_view_table"
-			label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_LABEL"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL"
-			description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_MAIN_DESCRIPTION"
+			layout="joomla.form.field.subform.repeatable-table"
-			multiple="false"
+			multiple="true"
-			default=""
+			description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
-			required="true"
+			icon="list">
-		/>
+			<form hidden="true" name="list_join_view_table_modal" repeat="true">
-		<!-- Add_php_after_getitem Field. Type: Radio. (joomla) -->
+				<!-- View_table Field. Type: Adminviews. (custom) -->
+				<field
+					type="adminviews"
+					name="view_table"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_LABEL"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION"
+					multiple="false"
+					default=""
+					required="false"
+					button="false"
+				/>
+				<!-- Row_type Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="row_type"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION"
+					class="list_class fieldMedium"
+					multiple="false"
+					filter="INT"
+					required="false"
+					default="1">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE</option>
+				</field>
+				<!-- As Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="as"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL"
+					class="list_class fieldSmall"
+					multiple="false"
+					filter="WORD"
+					required="false"
+					default="b">
+					<!-- Option Set. -->
+					<option value="b">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_B</option>
+					<option value="c">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_C</option>
+					<option value="d">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_D</option>
+					<option value="e">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_E</option>
+					<option value="f">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_F</option>
+					<option value="g">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_G</option>
+					<option value="h">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_H</option>
+					<option value="i">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_I</option>
+					<option value="j">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_J</option>
+					<option value="k">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_K</option>
+					<option value="l">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_L</option>
+					<option value="m">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_M</option>
+					<option value="n">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_N</option>
+					<option value="o">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_O</option>
+					<option value="p">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_P</option>
+					<option value="q">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_Q</option>
+					<option value="r">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_R</option>
+					<option value="s">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_S</option>
+					<option value="t">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_T</option>
+					<option value="u">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_U</option>
+					<option value="v">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_V</option>
+					<option value="w">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_W</option>
+					<option value="x">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_X</option>
+					<option value="y">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_Y</option>
+					<option value="z">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_Z</option>
+					<option value="aa">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_AA</option>
+					<option value="bb">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_BB</option>
+					<option value="cc">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_CC</option>
+					<option value="dd">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_DD</option>
+					<option value="ee">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_EE</option>
+					<option value="ff">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_FF</option>
+					<option value="gg">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_GG</option>
+					<option value="hh">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_HH</option>
+					<option value="ii">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_II</option>
+					<option value="jj">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_JJ</option>
+					<option value="kk">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_KK</option>
+					<option value="ll">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_LL</option>
+					<option value="mm">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_MM</option>
+					<option value="nn">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_NN</option>
+					<option value="oo">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_OO</option>
+					<option value="pp">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_PP</option>
+					<option value="qq">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_QQ</option>
+					<option value="rr">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_RR</option>
+					<option value="ss">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_SS</option>
+					<option value="tt">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_TT</option>
+					<option value="uu">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_UU</option>
+					<option value="vv">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_VV</option>
+					<option value="ww">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_WW</option>
+					<option value="xx">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_XX</option>
+					<option value="yy">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_YY</option>
+					<option value="zz">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ</option>
+				</field>
+				<!-- Type Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="type"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
+					class="list_class fieldMedium"
+					multiple="false"
+					filter="INT"
+					required="false"
+					default="1">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT_OUTER</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_INNER</option>
+					<option value="4">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT</option>
+					<option value="5">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER</option>
+				</field>
+				<!-- On_field Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="on_field"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_DESCRIPTION"
+					class="text_area fieldMedium"
+					readonly="false"
+					disabled="false"
+					required="false"
+					filter="CMD"
+					message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
+					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT"
+				/>
+				<!-- Operator Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="operator"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_DESCRIPTION"
+					class="list_class fieldMedium"
+					multiple="false"
+					filter="INT"
+					required="false"
+					default="0">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT</option>
+					<option value="4">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN</option>
+					<option value="5">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN</option>
+					<option value="6">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL</option>
+					<option value="7">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO</option>
+					<option value="8">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_LESS_THAN</option>
+					<option value="9">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN</option>
+					<option value="10">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_IN</option>
+					<option value="11">
+						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN</option>
+				</field>
+				<!-- Join_field Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="join_field"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION"
+					class="text_area fieldMedium"
+					readonly="false"
+					disabled="false"
+					required="false"
+					filter="CMD"
+					message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
+					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT"
+				/>
+				<!-- Selection Field. Type: Textarea. (joomla) -->
+				<field
+					type="textarea"
+					name="selection"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL"
+					rows="22"
+					cols="30"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION"
+					class="text_area span12"
+					filter="HTML"
+					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
+					required="false"
+				/>
+			</form>
+		</field>
+		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_getitem"
+			name="add_php_getlistquery"
-			label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_AFTER_GETITEM_LABEL"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_ADD_PHP_GETLISTQUERY_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -973,6 +1229,51 @@
 		</field>
 		<!-- Note_calculation_item Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_calculation_item" description="COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEM_DESCRIPTION" class="note_calculation_item" />
+		<!-- Group Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="group"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_DYNAMIC_GET_GROUP_DESCRIPTION"
+			icon="list">
+			<form hidden="true" name="list_group_modal" repeat="true">
+				<!-- Table_key Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="table_key"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="false"
+					filter="CMD"
+					message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
+					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
+				/>
+			</form>
+		</field>
+		<!-- Php_calculation Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_calculation"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_LABEL"
+			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
 		<!-- Global Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1146,279 +1447,6 @@
 				</field>
 			</form>
 		</field>
-		<!-- Php_calculation Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_calculation"
-			label="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_LABEL"
-			description="COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
-		<!-- Join_view_table Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="join_view_table"
-			label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
-			icon="list">
-			<form hidden="true" name="list_join_view_table_modal" repeat="true">
-				<!-- View_table Field. Type: Adminviews. (custom) -->
-				<field
-					type="adminviews"
-					name="view_table"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_LABEL"
-					description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION"
-					multiple="false"
-					default=""
-					required="false"
-					button="false"
-				/>
-				<!-- Row_type Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="row_type"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL"
-					description="COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION"
-					class="list_class fieldMedium"
-					multiple="false"
-					filter="INT"
-					required="false"
-					default="1">
-					<!-- Option Set. -->
-					<option value="1">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_SINGLE</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE</option>
-				</field>
-				<!-- As Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="as"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_AS_LABEL"
-					class="list_class fieldSmall"
-					multiple="false"
-					filter="WORD"
-					required="false"
-					default="b">
-					<!-- Option Set. -->
-					<option value="b">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_B</option>
-					<option value="c">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_C</option>
-					<option value="d">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_D</option>
-					<option value="e">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_E</option>
-					<option value="f">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_F</option>
-					<option value="g">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_G</option>
-					<option value="h">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_H</option>
-					<option value="i">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_I</option>
-					<option value="j">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_J</option>
-					<option value="k">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_K</option>
-					<option value="l">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_L</option>
-					<option value="m">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_M</option>
-					<option value="n">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_N</option>
-					<option value="o">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_O</option>
-					<option value="p">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_P</option>
-					<option value="q">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_Q</option>
-					<option value="r">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_R</option>
-					<option value="s">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_S</option>
-					<option value="t">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_T</option>
-					<option value="u">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_U</option>
-					<option value="v">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_V</option>
-					<option value="w">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_W</option>
-					<option value="x">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_X</option>
-					<option value="y">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_Y</option>
-					<option value="z">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_Z</option>
-					<option value="aa">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_AA</option>
-					<option value="bb">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_BB</option>
-					<option value="cc">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_CC</option>
-					<option value="dd">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_DD</option>
-					<option value="ee">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_EE</option>
-					<option value="ff">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_FF</option>
-					<option value="gg">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_GG</option>
-					<option value="hh">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_HH</option>
-					<option value="ii">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_II</option>
-					<option value="jj">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_JJ</option>
-					<option value="kk">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_KK</option>
-					<option value="ll">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_LL</option>
-					<option value="mm">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_MM</option>
-					<option value="nn">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_NN</option>
-					<option value="oo">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_OO</option>
-					<option value="pp">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_PP</option>
-					<option value="qq">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_QQ</option>
-					<option value="rr">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_RR</option>
-					<option value="ss">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_SS</option>
-					<option value="tt">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_TT</option>
-					<option value="uu">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_UU</option>
-					<option value="vv">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_VV</option>
-					<option value="ww">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_WW</option>
-					<option value="xx">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_XX</option>
-					<option value="yy">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_YY</option>
-					<option value="zz">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_ZZ</option>
-				</field>
-				<!-- Type Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="type"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
-					class="list_class fieldMedium"
-					multiple="false"
-					filter="INT"
-					required="false"
-					default="1">
-					<!-- Option Set. -->
-					<option value="1">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_LEFT_OUTER</option>
-					<option value="3">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_INNER</option>
-					<option value="4">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT</option>
-					<option value="5">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER</option>
-				</field>
-				<!-- On_field Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="on_field"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_DESCRIPTION"
-					class="text_area fieldMedium"
-					readonly="false"
-					disabled="false"
-					required="false"
-					filter="CMD"
-					message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
-					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT"
-				/>
-				<!-- Operator Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="operator"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_LABEL"
-					description="COM_COMPONENTBUILDER_DYNAMIC_GET_OPERATOR_DESCRIPTION"
-					class="list_class fieldMedium"
-					multiple="false"
-					filter="INT"
-					required="false"
-					default="0">
-					<!-- Option Set. -->
-					<option value="1">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL</option>
-					<option value="3">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT</option>
-					<option value="4">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN</option>
-					<option value="5">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN</option>
-					<option value="6">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL</option>
-					<option value="7">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO</option>
-					<option value="8">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_LESS_THAN</option>
-					<option value="9">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN</option>
-					<option value="10">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_IN</option>
-					<option value="11">
-						COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN</option>
-				</field>
-				<!-- Join_field Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="join_field"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION"
-					class="text_area fieldMedium"
-					readonly="false"
-					disabled="false"
-					required="false"
-					filter="CMD"
-					message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
-					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT"
-				/>
-				<!-- Selection Field. Type: Textarea. (joomla) -->
-				<field
-					type="textarea"
-					name="selection"
-					label="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_LABEL"
-					rows="22"
-					cols="30"
-					description="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION"
-					class="text_area span12"
-					filter="HTML"
-					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
-					required="false"
-				/>
-			</form>
-		</field>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->

admin/sql/install.mysql.utf8.sql

@@ -517,6 +517,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`getcustom` VARCHAR(255) NOT NULL DEFAULT '',
 	`gettype` TINYINT(1) NOT NULL DEFAULT 0,
 	`global` TEXT NOT NULL,
+	`group` TEXT NOT NULL,
 	`join_db_table` TEXT NOT NULL,
 	`join_view_table` TEXT NOT NULL,
 	`main_source` TINYINT(1) NOT NULL DEFAULT 0,
@@ -560,10 +561,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	KEY `idx_gettype` (`gettype`),
 	KEY `idx_add_php_after_getitems` (`add_php_after_getitems`),
 	KEY `idx_add_php_router_parse` (`add_php_router_parse`),
-	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
 	KEY `idx_add_php_before_getitems` (`add_php_before_getitems`),
 	KEY `idx_add_php_before_getitem` (`add_php_before_getitem`),
 	KEY `idx_add_php_after_getitem` (`add_php_after_getitem`),
+	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
 	KEY `idx_select_all` (`select_all`),
 	KEY `idx_getcustom` (`getcustom`),
 	KEY `idx_pagination` (`pagination`)

admin/sql/updates/mysql/2.9.14.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__componentbuilder_dynamic_get` ADD `group` TEXT NOT NULL AFTER `global`;

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>4th April, 2019</creationDate>
+	<creationDate>9th April, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.9.14</version>
+	<version>2.9.15</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.9.14)</h1>
+		<h1>Component Builder (v.2.9.15)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -628,4 +628,21 @@
 		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.9.15</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.15/JCB_v2.9.15.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

@@ -3752,9 +3752,9 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_custom_get","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_after_getitems":"add_php_after_getitems","add_php_router_parse":"add_php_router_parse","add_php_getlistquery":"add_php_getlistquery","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","view_selection":"view_selection","db_table_main":"db_table_main","php_custom_get":"php_custom_get","plugin_events":"plugin_events","db_selection":"db_selection","view_table_main":"view_table_main","add_php_after_getitem":"add_php_after_getitem","select_all":"select_all","php_before_getitem":"php_before_getitem","getcustom":"getcustom","php_after_getitem":"php_after_getitem","pagination":"pagination","php_getlistquery":"php_getlistquery","not_required":"not_required","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_custom_get","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","view_table_main":"view_table_main","addcalculation":"addcalculation","add_php_after_getitems":"add_php_after_getitems","add_php_router_parse":"add_php_router_parse","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","add_php_after_getitem":"add_php_after_getitem","db_table_main":"db_table_main","php_custom_get":"php_custom_get","plugin_events":"plugin_events","db_selection":"db_selection","add_php_getlistquery":"add_php_getlistquery","select_all":"select_all","php_before_getitem":"php_before_getitem","getcustom":"getcustom","php_after_getitem":"php_after_getitem","pagination":"pagination","php_getlistquery":"php_getlistquery","not_required":"not_required","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
-			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","add_php_after_getitems","add_php_router_parse","add_php_getlistquery","add_php_before_getitems","add_php_before_getitem","view_table_main","add_php_after_getitem","select_all","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
+			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","view_table_main","add_php_after_getitems","add_php_router_parse","add_php_before_getitems","add_php_before_getitem","add_php_after_getitem","add_php_getlistquery","select_all","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
 
 			// Set the object into the content types table.
 			$dynamic_get_Inserted = $db->insertObject('#__content_types', $dynamic_get);
@@ -4324,9 +4324,9 @@ class com_componentbuilderInstallerScript
 			$dynamic_get->type_title = 'Componentbuilder Dynamic_get';
 			$dynamic_get->type_alias = 'com_componentbuilder.dynamic_get';
 			$dynamic_get->table = '{"special": {"dbtable": "#__componentbuilder_dynamic_get","key": "id","type": "Dynamic_get","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_custom_get","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","addcalculation":"addcalculation","add_php_after_getitems":"add_php_after_getitems","add_php_router_parse":"add_php_router_parse","add_php_getlistquery":"add_php_getlistquery","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","view_selection":"view_selection","db_table_main":"db_table_main","php_custom_get":"php_custom_get","plugin_events":"plugin_events","db_selection":"db_selection","view_table_main":"view_table_main","add_php_after_getitem":"add_php_after_getitem","select_all":"select_all","php_before_getitem":"php_before_getitem","getcustom":"getcustom","php_after_getitem":"php_after_getitem","pagination":"pagination","php_getlistquery":"php_getlistquery","not_required":"not_required","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
+			$dynamic_get->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_custom_get","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","main_source":"main_source","gettype":"gettype","view_table_main":"view_table_main","addcalculation":"addcalculation","add_php_after_getitems":"add_php_after_getitems","add_php_router_parse":"add_php_router_parse","view_selection":"view_selection","add_php_before_getitems":"add_php_before_getitems","add_php_before_getitem":"add_php_before_getitem","add_php_after_getitem":"add_php_after_getitem","db_table_main":"db_table_main","php_custom_get":"php_custom_get","plugin_events":"plugin_events","db_selection":"db_selection","add_php_getlistquery":"add_php_getlistquery","select_all":"select_all","php_before_getitem":"php_before_getitem","getcustom":"getcustom","php_after_getitem":"php_after_getitem","pagination":"pagination","php_getlistquery":"php_getlistquery","not_required":"not_required","php_before_getitems":"php_before_getitems","php_after_getitems":"php_after_getitems","php_router_parse":"php_router_parse","php_calculation":"php_calculation"}}';
 			$dynamic_get->router = 'ComponentbuilderHelperRoute::getDynamic_getRoute';
-			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","add_php_after_getitems","add_php_router_parse","add_php_getlistquery","add_php_before_getitems","add_php_before_getitem","view_table_main","add_php_after_getitem","select_all","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
+			$dynamic_get->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/dynamic_get.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","main_source","gettype","view_table_main","add_php_after_getitems","add_php_router_parse","add_php_before_getitems","add_php_before_getitem","add_php_after_getitem","add_php_getlistquery","select_all","pagination","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "view_table_main","targetTable": "#__componentbuilder_admin_view","targetColumn": "id","displayColumn": "system_name"}]}';
 
 			// Check if dynamic_get type is already in content_type DB.
 			$dynamic_get_id = null;
@@ -5426,7 +5426,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.9.14 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.9.15 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}