Added context to site and custom admin views to better target triggered events. Added the redering option in the admin edit view, so to expand forms via plugins. Improved the codename build in site and custom admin view.

README.md

@@ -9,7 +9,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.8.8) 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.8.9) 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)
 
@@ -126,12 +126,12 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 23rd August, 2018
-+ *Version*: 2.8.8
++ *Version*: 2.8.9
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **188906**
++ *Line count*: **189114**
-+ *Field count*: **1063**
++ *Field count*: **1064**
-+ *File count*: **1243**
++ *File count*: **1244**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,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.8.8) 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.8.9) 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)
 
@@ -126,12 +126,12 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 23rd August, 2018
-+ *Version*: 2.8.8
++ *Version*: 2.8.9
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **188906**
++ *Line count*: **189114**
-+ *Field count*: **1063**
++ *Field count*: **1064**
-+ *File count*: **1243**
++ *File count*: **1244**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/helpers/compiler/a_Get.php

@@ -2097,6 +2097,16 @@ class Get
 		$view->code = $this->uniqueCode(ComponentbuilderHelper::safeString($view->codename));
 		$view->Code = ComponentbuilderHelper::safeString($view->code, 'F');
 		$view->CODE = ComponentbuilderHelper::safeString($view->code, 'U');
+		// load context if not set
+		if (!isset($view->context) || !ComponentbuilderHelper::checkString($view->context))
+		{
+			$view->context = $view->code;
+		}
+		else
+		{
+			// always make sure context is a safe string
+			$view->context = ComponentbuilderHelper::safeString($view->context);
+		}
 		// load the library
 		if (!isset($this->libManager[$this->target]))
 		{
@@ -2168,10 +2178,10 @@ class Get
 			}
 		}
 		// set the main get data
-		$main_get = $this->setGetData(array($view->main_get), $view->code);
+		$main_get = $this->setGetData(array($view->main_get), $view->code, $view->context);
 		$view->main_get = $main_get[0];
 		// set the custom_get data
-		$view->custom_get = $this->setGetData(json_decode($view->custom_get, true), $view->code);
+		$view->custom_get = $this->setGetData(json_decode($view->custom_get, true), $view->code, $view->context);
 		// set array adding array of scripts
 		$addArray = array('php_view', 'php_jview', 'php_jview_display', 'php_document', 'javascript_file', 'js_document', 'css_document', 'css');
 		foreach ($addArray as $scripter)
@@ -2750,13 +2760,14 @@ class Get
 	/**
 	 * Set get Data
 	 * 
-	 * @param   array    $ids  The ids of the dynamic get
+	 * @param   array    $ids        The ids of the dynamic get
 	 * @param   string   $view_code  The view code name
+	 * @param   string   $context    The context for events
 	 *
 	 * @return  oject the get dynamicGet data
 	 * 
 	 */
-	public function setGetData($ids, $view_code)
+	public function setGetData($ids, $view_code, $context)
 	{
 		if (ComponentbuilderHelper::checkArray($ids))
 		{
@@ -2828,6 +2839,7 @@ class Get
 								$result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->view_selection, $result->view_table_main, 'a', '', 'view');
 								$result->main_get[0]['as'] = 'a';
 								$result->main_get[0]['key'] = $result->key;
+								$result->main_get[0]['context'] = $context;
 								unset($result->view_selection);
 								break;
 							case 2:
@@ -2835,6 +2847,7 @@ class Get
 								$result->main_get[0]['selection'] = $this->setDataSelection($result->key, $view_code, $result->db_selection, $result->db_table_main, 'a', '', 'db');
 								$result->main_get[0]['as'] = 'a';
 								$result->main_get[0]['key'] = $result->key;
+								$result->main_get[0]['context'] = $context;
 								unset($result->db_selection);
 								break;
 							case 3:
@@ -2864,6 +2877,7 @@ class Get
 									$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)
 									{
@@ -2910,6 +2924,7 @@ class Get
 									$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)
 									{

admin/helpers/compiler/e_Interpretation.php

@@ -1809,7 +1809,13 @@ class Interpretation extends Fields
 	{
 		$fieldPrepare = '';
 		$runplugins = false;
-		$context = 'com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.' . $code;
+		// set component
+		$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
+		// set context 
+		$context = (isset($get['context'])) ? $get['context'] : $code;
+		$context = 'com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.' . $context;
+		// load parms builder only once
+		$params = false;
 		foreach ($checker as $field => $array)
 		{
 			// build load counter
@@ -1826,11 +1832,17 @@ class Interpretation extends Fields
 					$runplugins .= PHP_EOL . $tab . $this->_t(1) . "JPluginHelper::importPlugin('content');";
 					$runplugins .= PHP_EOL . $tab . $this->_t(1) . '$this->_dispatcher = JEventDispatcher::getInstance();';
 				}
+				if (!$params)
+				{
+					$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Check if item has params, or pass whole item.";
+					$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$params = (isset(" . $string . "->params) && " . $Component . "Helper::checkJson(" . $string . "->params)) ? json_decode(" . $string . "->params) : " . $string . ";";
+					$params = true;
+				}
 				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Make sure the content prepare plugins fire on " . $field;
 				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$_" . $field . " = new stdClass();";
 				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "\$_" . $field . '->text =& ' . $string . '->' . $field . '; //' . $this->setLine(__LINE__) . ' value must be in text';
 				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " Since all values are now in text (Joomla Limitation), we also add the field name (" . $field . ") to context";
-				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . '$this->_dispatcher->trigger("onContentPrepare", array(\'' . $context . '.' . $field . '\', &$_' . $field . ', &$this->params, 0));'; // we can improve the params later (TODO)
+				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1) . '$this->_dispatcher->trigger("onContentPrepare", array(\'' . $context . '.' . $field . '\', &$_' . $field . ', &$params, 0));';
 			}
 		}
 		// load dispatcher
@@ -3206,6 +3218,8 @@ class Interpretation extends Fields
 				$method .= PHP_EOL . $this->_t(2) . "JPluginHelper::importPlugin('content');";
 				$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Setup Event Object.";
 				$method .= PHP_EOL . $this->_t(2) . "\$this->item->event = new stdClass;";
+				$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Check if item has params, or pass global params";
+				$method .= PHP_EOL . $this->_t(2) . "\$params = (isset(\$this->item->params) && " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkJson(\$this->item->params)) ? json_decode(\$this->item->params) : \$this->params;";
 				// load the defaults
 				foreach ($view['settings']->main_get->plugin_events as $plugin_event)
 				{
@@ -3219,7 +3233,7 @@ class Interpretation extends Fields
 					else
 					{
 						$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " " . $plugin_event . " Event Trigger.";
-						$method .= PHP_EOL . $this->_t(2) . "\$results = \$dispatcher->trigger('" . $plugin_event . "', array('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . ".article', &\$this->item, &\$this->params, 0));";
+						$method .= PHP_EOL . $this->_t(2) . "\$results = \$dispatcher->trigger('" . $plugin_event . "', array('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $view['settings']->context . "', &\$this->item, &\$params, 0));";
 						$method .= PHP_EOL . $this->_t(2) . '$this->item->event->' . $plugin_event . ' = trim(implode("\n", $results));';
 					}
 				}
@@ -7519,13 +7533,10 @@ class Interpretation extends Fields
 				// set counter
 				$tabCounter++;
 			}
-			// add joomla field sets if needed
+			// add option to load forms loded in via plugins
-			if (isset($view['joomla_fields']) && $view['joomla_fields'] == 1)
+			$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php \$this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>";
-			{
+			$body .= PHP_EOL . $this->_t(1) . "<?php \$this->tab_name = '" . $viewName_single . "Tab'; ?>";
-				$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php \$this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>";
+			$body .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('joomla.edit.params', \$this); ?>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php \$this->tab_name = '" . $viewName_single . "Tab'; ?>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('joomla.edit.params', \$this); ?>";
-			}
 			// set default publishing tab lang
 			$tabLangName = $langView . '_PUBLISHING';
 			// add to lang array
@@ -7869,7 +7880,7 @@ class Interpretation extends Fields
 			// LAYOUTITEMSTABLE <<<DYNAMIC>>>
 			$this->fileContentDynamic[$viewName_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh] = $head . $body;
 			// LAYOUTITEMSHEADER <<<DYNAMIC>>>
-			$headerscript .= '//' . $this->setLine(__LINE__) . ' set the edit URL';
+			$headerscript = '//' . $this->setLine(__LINE__) . ' set the edit URL';
 			$headerscript .= PHP_EOL . '$edit = "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $list . '&task=' . $single . '.edit";';
 			$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' set a return value';
 			$headerscript .= PHP_EOL . '$return = ($id) ? "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $viewName_single . '&layout=edit&id=" . $id : "";';

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

@@ -914,7 +914,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_MESSAGE="Error! Please add some text
 COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE="Table"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TABLET="Tablet"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL="Select a Table"
-COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION="Select the tab this field belongs to."
+COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION="Select the tab this view belongs to."
 COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL="Tab"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TAG="Tag"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TAGS="Tags"
@@ -2810,6 +2810,11 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COGS="Cogs"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMMENT="Comment"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMPASS="Compass"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT="Context"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_DESCRIPTION="Do not add the component name, just the context/view code name that should be used during event triggers, if this view has events. Leaving this blank will default to the Name in Code."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_HINT="article"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_LABEL="Context"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_MESSAGE="Error! Please add context code name here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT_TWO="Contract 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Custom Admin View."

admin/layouts/custom_admin_view/details_above.php

@@ -15,7 +15,8 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = array(
-	'system_name'
+	'system_name',
+	'context'
 );
 
 ?>

admin/models/compiler.php

@@ -103,11 +103,13 @@ class ComponentbuilderModelCompiler extends JModelList
 			{
 				// Always create a slug for sef URL's
 				$item->slug = (isset($item->alias) && isset($item->id)) ? $item->id.':'.$item->alias : $item->id;
+				// Check if item has params, or pass whole item.
+				$params = (isset($item->params) && ComponentbuilderHelper::checkJson($item->params)) ? json_decode($item->params) : $item;
 				// Make sure the content prepare plugins fire on copyright
 				$_copyright = new stdClass();
 				$_copyright->text =& $item->copyright; // value must be in text
 				// Since all values are now in text (Joomla Limitation), we also add the field name (copyright) to context
-				$this->_dispatcher->trigger("onContentPrepare", array('com_componentbuilder.compiler.copyright', &$_copyright, &$this->params, 0));
+				$this->_dispatcher->trigger("onContentPrepare", array('com_componentbuilder.compiler.copyright', &$_copyright, &$params, 0));
 				// Checking if copyright has uikit components that must be loaded.
 				$this->uikitComp = ComponentbuilderHelper::getUikitComp($item->copyright,$this->uikitComp);
 			}

admin/models/custom_admin_view.php

@@ -86,18 +86,18 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_view))
-			{
-				// base64 Decode php_view.
-				$item->php_view = base64_decode($item->php_view);
-			}
-
 			if (!empty($item->php_jview_display))
 			{
 				// base64 Decode php_jview_display.
 				$item->php_jview_display = base64_decode($item->php_jview_display);
 			}
 
+			if (!empty($item->php_view))
+			{
+				// base64 Decode php_view.
+				$item->php_view = base64_decode($item->php_view);
+			}
+
 			if (!empty($item->default))
 			{
 				// base64 Decode default.
@@ -975,6 +975,31 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 
 		// always reset the snippets
 		$data['snippet'] = 0;
+		// if system name is empty create from name
+		if (empty($data['system_name']) || !ComponentbuilderHelper::checkString($data['system_name']))
+		{
+			$data['system_name'] = $data['name'];
+		}
+		// if codename is empty create from name
+		if (empty($data['codename']) || !ComponentbuilderHelper::checkString($data['codename']))
+		{
+			$data['codename'] = ComponentbuilderHelper::safeString($data['name']);
+		}
+		else
+		{
+			// always make safe string
+			$data['codename'] = ComponentbuilderHelper::safeString($data['codename']);
+		}
+		// if context is empty create from codename
+		if (empty($data['context']) || !ComponentbuilderHelper::checkString($data['context']))
+		{
+			$data['context'] = $data['codename'];
+		}
+		else
+		{
+			// always make safe string
+			$data['context'] = ComponentbuilderHelper::safeString($data['context']);
+		}
 
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
@@ -1028,18 +1053,18 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the php_view string to base64 string.
-		if (isset($data['php_view']))
-		{
-			$data['php_view'] = base64_encode($data['php_view']);
-		}
-
 		// Set the php_jview_display string to base64 string.
 		if (isset($data['php_jview_display']))
 		{
 			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
 		}
 
+		// Set the php_view string to base64 string.
+		if (isset($data['php_view']))
+		{
+			$data['php_view'] = base64_encode($data['php_view']);
+		}
+
 		// Set the default string to base64 string.
 		if (isset($data['default']))
 		{

admin/models/custom_admin_views.php

@@ -233,7 +233,7 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.main_get LIKE '.$search.' OR g.name LIKE '.$search.' OR a.codename LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.main_get LIKE '.$search.' OR g.name LIKE '.$search.' OR a.context LIKE '.$search.' OR a.codename LIKE '.$search.')');
 			}
 		}
 
@@ -317,10 +317,10 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 							continue;
 						}
 
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
 						// decode php_jview_display
 						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_view
+						$item->php_view = base64_decode($item->php_view);
 						// decode default
 						$item->default = base64_decode($item->default);
 						// decode php_jview

admin/models/forms/custom_admin_view.xml

@@ -140,23 +140,6 @@
 			required="true"
 			button="true"
 		/>
-		<!-- Php_view Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_view"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
 		<!-- Php_jview_display Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -174,6 +157,39 @@
 			required="true"
 			validate="code"
 		/>
+		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
+		<!-- Php_view Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_view"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Add_css_document Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Add_css Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -188,8 +204,20 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Add_js_document Field. Type: Radio. (joomla) -->
-		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
+		<field
+			type="radio"
+			name="add_js_document"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Add_javascript_file Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -205,36 +233,21 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_css_document Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_document"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-		</field>
 		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_libraries_selection" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_selection" />
-		<!-- Add_js_document Field. Type: Radio. (joomla) -->
+		<!-- Context Field. Type: Text. (joomla) -->
 		<field
-			type="radio"
+			type="text"
-			name="add_js_document"
+			name="context"
-			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_LABEL"
-			class="btn-group btn-group-yesno"
+			size="40"
-			default="0"
+			maxlength="50"
-			required="true">
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_DESCRIPTION"
-			<!-- Option Set. -->
+			class="text_area"
-			<option value="1">
+			filter="WORD"
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+			message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_MESSAGE"
-			<option value="0">
+			hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_HINT"
-				COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+		/>
-		</field>
 		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
 		<!-- Default Field. Type: Editor. (joomla) -->

admin/models/site_view.php

@@ -1003,11 +1003,21 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		{
 			$data['codename'] = ComponentbuilderHelper::safeString($data['name']);
 		}
+		else
+		{
+			// always make safe string
+			$data['codename'] = ComponentbuilderHelper::safeString($data['codename']);
+		}
 		// if context is empty create from codename
 		if (empty($data['context']) || !ComponentbuilderHelper::checkString($data['context']))
 		{
 			$data['context'] = $data['codename'];
 		}
+		else
+		{
+			// always make safe string
+			$data['context'] = ComponentbuilderHelper::safeString($data['context']);
+		}
 
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))

admin/sql/install.mysql.utf8.sql

@@ -283,6 +283,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
 	`ajax_input` TEXT NOT NULL,
 	`codename` VARCHAR(255) NOT NULL DEFAULT '',
+	`context` VARCHAR(255) NOT NULL DEFAULT '',
 	`css` TEXT NOT NULL,
 	`css_document` TEXT NOT NULL,
 	`custom_button` TEXT NOT NULL,
@@ -326,10 +327,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name` (`name`),
 	KEY `idx_main_get` (`main_get`),
-	KEY `idx_add_css` (`add_css`),
-	KEY `idx_add_javascript_file` (`add_javascript_file`),
 	KEY `idx_add_css_document` (`add_css_document`),
+	KEY `idx_add_css` (`add_css`),
 	KEY `idx_add_js_document` (`add_js_document`),
+	KEY `idx_add_javascript_file` (`add_javascript_file`),
+	KEY `idx_context` (`context`),
 	KEY `idx_codename` (`codename`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_dynamic_get` (`dynamic_get`),

admin/sql/updates/mysql/2.8.8.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `context` VARCHAR(255) NOT NULL DEFAULT '' AFTER `codename`;

admin/views/admin_fields/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'admin_fieldsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('admin_fields.delete') || $this->canDo->get('admin_fields.edit.created_by') || $this->canDo->get('admin_fields.edit.state') || $this->canDo->get('admin_fields.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'admin_fieldsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_ADMIN_FIELDS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/admin_fields_conditions/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'admin_fields_conditionsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('admin_fields_conditions.delete') || $this->canDo->get('admin_fields_conditions.edit.created_by') || $this->canDo->get('admin_fields_conditions.edit.state') || $this->canDo->get('admin_fields_conditions.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'admin_fields_conditionsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/admin_fields_relations/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'admin_fields_relationsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('admin_fields_relations.delete') || $this->canDo->get('admin_fields_relations.edit.created_by') || $this->canDo->get('admin_fields_relations.edit.state') || $this->canDo->get('admin_fields_relations.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'admin_fields_relationsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/admin_view/tmpl/edit.php

@@ -157,6 +157,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'admin_viewTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('admin_view.delete') || $this->canDo->get('admin_view.edit.created_by') || $this->canDo->get('admin_view.edit.state') || $this->canDo->get('admin_view.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'admin_viewTab', 'publishing', JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_admin_views/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_admin_viewsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_admin_views.delete') || $this->canDo->get('component_admin_views.edit.created_by') || $this->canDo->get('component_admin_views.edit.state') || $this->canDo->get('component_admin_views.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_admin_viewsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_config/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_configTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_config.delete') || $this->canDo->get('component_config.edit.created_by') || $this->canDo->get('component_config.edit.state') || $this->canDo->get('component_config.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_configTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_CONFIG_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_custom_admin_menus/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_custom_admin_menusTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_custom_admin_menus.delete') || $this->canDo->get('component_custom_admin_menus.edit.created_by') || $this->canDo->get('component_custom_admin_menus.edit.state') || $this->canDo->get('component_custom_admin_menus.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_custom_admin_menusTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_custom_admin_views/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_custom_admin_viewsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_custom_admin_views.delete') || $this->canDo->get('component_custom_admin_views.edit.created_by') || $this->canDo->get('component_custom_admin_views.edit.state') || $this->canDo->get('component_custom_admin_views.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_custom_admin_viewsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_dashboard/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_dashboardTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_dashboard.delete') || $this->canDo->get('component_dashboard.edit.created_by') || $this->canDo->get('component_dashboard.edit.state') || $this->canDo->get('component_dashboard.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_dashboardTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_files_folders/tmpl/edit.php

@@ -69,6 +69,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_files_foldersTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_files_folders.delete') || $this->canDo->get('component_files_folders.edit.created_by') || $this->canDo->get('component_files_folders.edit.state') || $this->canDo->get('component_files_folders.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_files_foldersTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_mysql_tweaks/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_mysql_tweaksTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_mysql_tweaks.delete') || $this->canDo->get('component_mysql_tweaks.edit.created_by') || $this->canDo->get('component_mysql_tweaks.edit.state') || $this->canDo->get('component_mysql_tweaks.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_mysql_tweaksTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_site_views/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_site_viewsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_site_views.delete') || $this->canDo->get('component_site_views.edit.created_by') || $this->canDo->get('component_site_views.edit.state') || $this->canDo->get('component_site_views.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_site_viewsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/component_updates/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'component_updatesTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('component_updates.delete') || $this->canDo->get('component_updates.edit.created_by') || $this->canDo->get('component_updates.edit.state') || $this->canDo->get('component_updates.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'component_updatesTab', 'publishing', JText::_('COM_COMPONENTBUILDER_COMPONENT_UPDATES_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/custom_admin_view/tmpl/edit.php

@@ -109,6 +109,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'custom_admin_viewTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'publishing', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/custom_admin_views/tmpl/default_body.php

@@ -76,7 +76,11 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 			<div><?php echo JText::_('COM_COMPONENTBUILDER_NAME'); ?>: <b>
 			<?php echo $this->escape($item->name); ?></b><br />
 	<?php echo JText::_('COM_COMPONENTBUILDER_CODE'); ?>: <b>
-			<?php echo $this->escape($item->codename); ?></b>
+			<?php echo $this->escape($item->codename); ?></b><br />
+	<?php if (ComponentbuilderHelper::checkString($item->context)): ?>
+	<?php echo JText::_('COM_COMPONENTBUILDER_CONTEXT'); ?>: <b>
+			<?php echo $this->escape($item->context); ?></b>
+	<?php endif; ?>
 			</div>
 		</td>
 		<td class="hidden-phone">

admin/views/custom_code/tmpl/edit.php

@@ -65,6 +65,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'custom_codeTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('custom_code.delete') || $this->canDo->get('custom_code.edit.created_by') || $this->canDo->get('custom_code.edit.state') || $this->canDo->get('custom_code.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'custom_codeTab', 'publishing', JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/dynamic_get/tmpl/edit.php

@@ -108,6 +108,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'dynamic_getTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('dynamic_get.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('dynamic_get.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'dynamic_getTab', 'publishing', JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/field/tmpl/edit.php

@@ -96,6 +96,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'fieldTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('field.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('field.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'fieldTab', 'publishing', JText::_('COM_COMPONENTBUILDER_FIELD_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/fieldtype/tmpl/edit.php

@@ -76,6 +76,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 	<?php endif; ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'fieldtypeTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('fieldtype.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('fieldtype.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'fieldtypeTab', 'publishing', JText::_('COM_COMPONENTBUILDER_FIELDTYPE_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/help_document/tmpl/edit.php

@@ -65,6 +65,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'help_documentTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('help_document.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('help_document.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'help_documentTab', 'publishing', JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/joomla_component/tmpl/edit.php

@@ -173,6 +173,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'joomla_componentTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('joomla_component.delete') || $this->canDo->get('joomla_component.edit.created_by') || $this->canDo->get('joomla_component.edit.state') || $this->canDo->get('joomla_component.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'joomla_componentTab', 'publishing', JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/language/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'languageTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('language.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('language.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'languageTab', 'publishing', JText::_('COM_COMPONENTBUILDER_LANGUAGE_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/language_translation/tmpl/edit.php

@@ -58,6 +58,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'language_translationTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('language_translation.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('language_translation.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'language_translationTab', 'publishing', JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/layout/tmpl/edit.php

@@ -75,6 +75,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'layoutTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'layoutTab', 'publishing', JText::_('COM_COMPONENTBUILDER_LAYOUT_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/library/tmpl/edit.php

@@ -95,6 +95,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'libraryTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('library.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('library.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'libraryTab', 'publishing', JText::_('COM_COMPONENTBUILDER_LIBRARY_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/library_config/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'library_configTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('library_config.delete') || $this->canDo->get('library_config.edit.created_by') || $this->canDo->get('library_config.edit.state') || $this->canDo->get('library_config.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'library_configTab', 'publishing', JText::_('COM_COMPONENTBUILDER_LIBRARY_CONFIG_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/library_files_folders_urls/tmpl/edit.php

@@ -69,6 +69,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'library_files_folders_urlsTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('library_files_folders_urls.delete') || $this->canDo->get('library_files_folders_urls.edit.created_by') || $this->canDo->get('library_files_folders_urls.edit.state') || $this->canDo->get('library_files_folders_urls.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'library_files_folders_urlsTab', 'publishing', JText::_('COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/server/tmpl/edit.php

@@ -77,6 +77,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 	<?php endif; ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'serverTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('server.delete') || $this->canDo->get('server.edit.created_by') || $this->canDo->get('server.edit.state') || $this->canDo->get('server.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'serverTab', 'publishing', JText::_('COM_COMPONENTBUILDER_SERVER_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/site_view/tmpl/edit.php

@@ -112,6 +112,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'site_viewTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'site_viewTab', 'publishing', JText::_('COM_COMPONENTBUILDER_SITE_VIEW_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/snippet/tmpl/edit.php

@@ -54,6 +54,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'snippetTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'snippetTab', 'publishing', JText::_('COM_COMPONENTBUILDER_SNIPPET_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/snippet_type/tmpl/edit.php

@@ -59,6 +59,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'snippet_typeTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('snippet_type.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('snippet_type.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'snippet_typeTab', 'publishing', JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPE_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/template/tmpl/edit.php

@@ -75,6 +75,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'templateTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'templateTab', 'publishing', JText::_('COM_COMPONENTBUILDER_TEMPLATE_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

admin/views/validation_rule/tmpl/edit.php

@@ -65,6 +65,10 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php $this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>
+	<?php $this->tab_name = 'validation_ruleTab'; ?>
+	<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
 	<?php if ($this->canDo->get('validation_rule.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('validation_rule.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'validation_ruleTab', 'publishing', JText::_('COM_COMPONENTBUILDER_VALIDATION_RULE_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">

componentbuilder.xml

@@ -7,9 +7,9 @@
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.8.8</version>
+	<version>2.8.9</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.8.8)</h1>
+		<h1>Component Builder (v.2.8.9)</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

@@ -492,4 +492,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.8.9</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">http://domain.com/demo.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

@@ -3390,9 +3390,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->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_view","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": {"system_name":"system_name","name":"name","description":"description","main_get":"main_get","php_view":"php_view","php_jview_display":"php_jview_display","add_css":"add_css","add_javascript_file":"add_javascript_file","add_css_document":"add_css_document","add_js_document":"add_js_document","default":"default","snippet":"snippet","icon":"icon","php_jview":"php_jview","not_required":"not_required","codename":"codename","custom_get":"custom_get","js_document":"js_document","add_php_ajax":"add_php_ajax","javascript_file":"javascript_file","css_document":"css_document","php_document":"php_document","css":"css","libraries":"libraries","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
+			$custom_admin_view->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_jview_display","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": {"system_name":"system_name","name":"name","description":"description","main_get":"main_get","php_jview_display":"php_jview_display","php_view":"php_view","add_css_document":"add_css_document","add_css":"add_css","add_js_document":"add_js_document","add_javascript_file":"add_javascript_file","context":"context","default":"default","snippet":"snippet","icon":"icon","php_jview":"php_jview","not_required":"not_required","codename":"codename","custom_get":"custom_get","js_document":"js_document","add_php_ajax":"add_php_ajax","javascript_file":"javascript_file","css_document":"css_document","php_document":"php_document","css":"css","libraries":"libraries","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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_get","add_css","add_javascript_file","add_css_document","add_js_document","snippet","not_required","add_php_ajax","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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_get","add_css_document","add_css","add_js_document","add_javascript_file","snippet","not_required","add_php_ajax","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$custom_admin_view_Inserted = $db->insertObject('#__content_types', $custom_admin_view);
@@ -3858,9 +3858,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->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_view","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": {"system_name":"system_name","name":"name","description":"description","main_get":"main_get","php_view":"php_view","php_jview_display":"php_jview_display","add_css":"add_css","add_javascript_file":"add_javascript_file","add_css_document":"add_css_document","add_js_document":"add_js_document","default":"default","snippet":"snippet","icon":"icon","php_jview":"php_jview","not_required":"not_required","codename":"codename","custom_get":"custom_get","js_document":"js_document","add_php_ajax":"add_php_ajax","javascript_file":"javascript_file","css_document":"css_document","php_document":"php_document","css":"css","libraries":"libraries","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
+			$custom_admin_view->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_jview_display","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": {"system_name":"system_name","name":"name","description":"description","main_get":"main_get","php_jview_display":"php_jview_display","php_view":"php_view","add_css_document":"add_css_document","add_css":"add_css","add_js_document":"add_js_document","add_javascript_file":"add_javascript_file","context":"context","default":"default","snippet":"snippet","icon":"icon","php_jview":"php_jview","not_required":"not_required","codename":"codename","custom_get":"custom_get","js_document":"js_document","add_php_ajax":"add_php_ajax","javascript_file":"javascript_file","css_document":"css_document","php_document":"php_document","css":"css","libraries":"libraries","php_ajaxmethod":"php_ajaxmethod","dynamic_get":"dynamic_get","add_php_document":"add_php_document","add_php_view":"add_php_view","add_custom_button":"add_custom_button","add_php_jview_display":"add_php_jview_display","add_php_jview":"add_php_jview","php_controller":"php_controller","php_model":"php_model"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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_get","add_css","add_javascript_file","add_css_document","add_js_document","snippet","not_required","add_php_ajax","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.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_get","add_css_document","add_css","add_js_document","add_javascript_file","snippet","not_required","add_php_ajax","dynamic_get","add_php_document","add_php_view","add_custom_button","add_php_jview_display","add_php_jview"],"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": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if custom_admin_view type is already in content_type DB.
 			$custom_admin_view_id = null;
@@ -4989,7 +4989,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.8.8 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.8.9 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}