Added filters above the admin list views to resolve gh-378

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 save 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.11.7) 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.12.1) 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)
 
@@ -145,12 +145,12 @@ TODO
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 3rd December, 2020
-+ *Version*: 2.11.7
++ *Version*: 2.12.1
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **285207**
++ *Line count*: **289034**
 + *Field count*: **1537**
-+ *File count*: **1799**
++ *File count*: **1880**
 + *Folder count*: **304**
 
 > 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 save 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.11.7) 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.12.1) 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)
 
@@ -145,12 +145,12 @@ TODO
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 3rd December, 2020
-+ *Version*: 2.11.7
++ *Version*: 2.12.1
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **285207**
++ *Line count*: **289034**
 + *Field count*: **1537**
-+ *File count*: **1799**
++ *File count*: **1880**
 + *Folder count*: **304**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/helpers/compiler/e_Interpretation.php

@@ -20868,8 +20868,6 @@ class Interpretation extends Fields
 		$state = '';
 		// keep track of all fields already added
 		$donelist = array();
-		// add the default populate states (this must be added first)
-		$state .= $this->setDefaultPopulateState($nameSingleCode);
 		// we must add the formSubmited code if new above filters is used
 		$new_filter = false;
 		if (isset($this->adminFilterType[$nameListCode])
@@ -20881,6 +20879,8 @@ class Interpretation extends Fields
 				. " = \$app->input->post->get('form_submited');";
 			$new_filter = true;
 		}
+		// add the default populate states (this must be added first)
+		$state .= $this->setDefaultPopulateState($nameSingleCode, $new_filter);
 		// add the filters
 		if (isset($this->filterBuilder[$nameListCode])
 			&& ComponentbuilderHelper::checkArray(
@@ -20923,13 +20923,13 @@ class Interpretation extends Fields
 	 * Add the code of the filter in the populate state
 	 *
 	 * @param   array   $filter      The field/filter array
-	 * @param   bool    $new_filter  The switch to use the new filter
+	 * @param   bool    $newFilter  The switch to use the new filter
 	 * @param   string  $extra       The defaults/extra options of the filter
 	 *
 	 * @return  string    The code for the populate state
 	 *
 	 */
-	protected function getPopulateStateFilterCode(&$filter, $new_filter,
+	protected function getPopulateStateFilterCode(&$filter, $newFilter,
 		$extra = ''
 	) {
 		$state = '';
@@ -20950,7 +20950,7 @@ class Interpretation extends Fields
 			. " = \$this->getUserStateFromRequest(\$this->context . '.filter."
 			. $filter['code'] . "', 'filter_" . $filter['code']
 			. "'" . $extra . ");";
-		if ($new_filter)
+		if ($newFilter)
 		{
 			// add the new filter option
 			$state .= PHP_EOL . $this->_t(2)
@@ -20978,11 +20978,12 @@ class Interpretation extends Fields
 	 * set the default populate state code
 	 *
 	 * @param   string  $nameSingleCode  The single view name
+	 * @param   bool    $newFilter      The switch to use the new filter
 	 *
 	 * @return  string The state code added
 	 *
 	 */
-	protected function setDefaultPopulateState(&$nameSingleCode)
+	protected function setDefaultPopulateState(&$nameSingleCode, $newFilter)
 	{
 		$state = '';
 		// start filter
@@ -20992,7 +20993,7 @@ class Interpretation extends Fields
 		{
 			$filter['code'] = "access";
 			$state          .= $this->getPopulateStateFilterCode(
-				$filter, false, ", 0, 'int'"
+				$filter, $newFilter, ", 0, 'int'"
 			);
 		}
 		// if published is not set add its default filter here

admin/helpers/compiler/f_Infusion.php

@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 /**
- * Interpretation class
+ * Infusion class
  */
 class Infusion extends Interpretation
 {

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

@@ -5336,6 +5336,214 @@ COM_COMPONENTBUILDER_FILE_BSB_WAS_MOVED_TO_BSB="File <b>%s</b> was moved to <b>%
 COM_COMPONENTBUILDER_FILE_BSB_WAS_NOT_MOVED_TO_BSB="File <b>%s</b> was not moved to <b>%s</b>"
 COM_COMPONENTBUILDER_FILE_BSB_WAS_SUCCESSFULLY_UNLOCKED="File <b>%s</b> was successfully unlocked!"
 COM_COMPONENTBUILDER_FILTER="Filter"
+COM_COMPONENTBUILDER_FILTER_ADMIN_VIEW_ASCENDING="Admin View ascending"
+COM_COMPONENTBUILDER_FILTER_ADMIN_VIEW_DESCENDING="Admin View descending"
+COM_COMPONENTBUILDER_FILTER_CLASS_EXTENDS_ASCENDING="Class Extends ascending"
+COM_COMPONENTBUILDER_FILTER_CLASS_EXTENDS_DESCENDING="Class Extends descending"
+COM_COMPONENTBUILDER_FILTER_COMMENT_TYPE_ASCENDING="Comment Type ascending"
+COM_COMPONENTBUILDER_FILTER_COMMENT_TYPE_DESCENDING="Comment Type descending"
+COM_COMPONENTBUILDER_FILTER_COMPANYNAME_ASCENDING="Companyname ascending"
+COM_COMPONENTBUILDER_FILTER_COMPANYNAME_DESCENDING="Companyname descending"
+COM_COMPONENTBUILDER_FILTER_COMPONENT_ASCENDING="Component ascending"
+COM_COMPONENTBUILDER_FILTER_COMPONENT_DESCENDING="Component descending"
+COM_COMPONENTBUILDER_FILTER_CONTEXT_ASCENDING="Context ascending"
+COM_COMPONENTBUILDER_FILTER_CONTEXT_DESCENDING="Context descending"
+COM_COMPONENTBUILDER_FILTER_DATATYPE_ASCENDING="Datatype ascending"
+COM_COMPONENTBUILDER_FILTER_DATATYPE_DESCENDING="Datatype descending"
+COM_COMPONENTBUILDER_FILTER_DESCRIPTION_ASCENDING="Description ascending"
+COM_COMPONENTBUILDER_FILTER_DESCRIPTION_DESCENDING="Description descending"
+COM_COMPONENTBUILDER_FILTER_DYNAMIC_GET_ASCENDING="Dynamic Get ascending"
+COM_COMPONENTBUILDER_FILTER_DYNAMIC_GET_DESCENDING="Dynamic Get descending"
+COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_ASCENDING="Extension Type ascending"
+COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_DESCENDING="Extension Type descending"
+COM_COMPONENTBUILDER_FILTER_FIELDS_CATEGORIES_ASCENDING="Fields Categories ascending"
+COM_COMPONENTBUILDER_FILTER_FIELDS_CATEGORIES_DESCENDING="Fields Categories descending"
+COM_COMPONENTBUILDER_FILTER_FIELDTYPES_CATEGORIES_ASCENDING="Fieldtypes Categories ascending"
+COM_COMPONENTBUILDER_FILTER_FIELDTYPES_CATEGORIES_DESCENDING="Fieldtypes Categories descending"
+COM_COMPONENTBUILDER_FILTER_FIELDTYPE_ASCENDING="Fieldtype ascending"
+COM_COMPONENTBUILDER_FILTER_FIELDTYPE_DESCENDING="Fieldtype descending"
+COM_COMPONENTBUILDER_FILTER_GETTYPE_ASCENDING="Gettype ascending"
+COM_COMPONENTBUILDER_FILTER_GETTYPE_DESCENDING="Gettype descending"
+COM_COMPONENTBUILDER_FILTER_HEADING_ASCENDING="Heading ascending"
+COM_COMPONENTBUILDER_FILTER_HEADING_DESCENDING="Heading descending"
+COM_COMPONENTBUILDER_FILTER_INDEXES_ASCENDING="Indexes ascending"
+COM_COMPONENTBUILDER_FILTER_INDEXES_DESCENDING="Indexes descending"
+COM_COMPONENTBUILDER_FILTER_JOOMLA_PLUGIN_GROUP_ASCENDING="Joomla Plugin Group ascending"
+COM_COMPONENTBUILDER_FILTER_JOOMLA_PLUGIN_GROUP_DESCENDING="Joomla Plugin Group descending"
+COM_COMPONENTBUILDER_FILTER_LANGTAG_ASCENDING="Langtag ascending"
+COM_COMPONENTBUILDER_FILTER_LANGTAG_DESCENDING="Langtag descending"
+COM_COMPONENTBUILDER_FILTER_LIBRARY_ASCENDING="Library ascending"
+COM_COMPONENTBUILDER_FILTER_LIBRARY_DESCENDING="Library descending"
+COM_COMPONENTBUILDER_FILTER_LOCATION_ASCENDING="Location ascending"
+COM_COMPONENTBUILDER_FILTER_LOCATION_DESCENDING="Location descending"
+COM_COMPONENTBUILDER_FILTER_MAIN_GET_ASCENDING="Main Get ascending"
+COM_COMPONENTBUILDER_FILTER_MAIN_GET_DESCENDING="Main Get descending"
+COM_COMPONENTBUILDER_FILTER_MAIN_SOURCE_ASCENDING="Main Source ascending"
+COM_COMPONENTBUILDER_FILTER_MAIN_SOURCE_DESCENDING="Main Source descending"
+COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING="Name ascending"
+COM_COMPONENTBUILDER_FILTER_NAME_CODE_ASCENDING="Name Code ascending"
+COM_COMPONENTBUILDER_FILTER_NAME_CODE_DESCENDING="Name Code descending"
+COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING="Name descending"
+COM_COMPONENTBUILDER_FILTER_NAME_SINGLE_ASCENDING="Name Single ascending"
+COM_COMPONENTBUILDER_FILTER_NAME_SINGLE_DESCENDING="Name Single descending"
+COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_ASCENDING="Null Switch ascending"
+COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_DESCENDING="Null Switch descending"
+COM_COMPONENTBUILDER_FILTER_PATH_ASCENDING="Path ascending"
+COM_COMPONENTBUILDER_FILTER_PATH_DESCENDING="Path descending"
+COM_COMPONENTBUILDER_FILTER_PROTOCOL_ASCENDING="Protocol ascending"
+COM_COMPONENTBUILDER_FILTER_PROTOCOL_DESCENDING="Protocol descending"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED="Status"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_CUSTOM_TABS="Status options for admins custom tabs"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_FIELDS="Status options for admins fields"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_FIELDS_CONDITIONS="Status options for admins fields conditions"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_FIELDS_RELATIONS="Status options for admins fields relations"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMIN_VIEWS="Status options for admin views"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_CLASS_EXTENDINGS="Status options for class extendings"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_CLASS_METHODS="Status options for class methods"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_CLASS_PROPERTIES="Status options for class properties"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_ADMIN_VIEWS="Status options for components admin views"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_CONFIG="Status options for components config"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_CUSTOM_ADMIN_MENUS="Status options for components custom admin menus"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_CUSTOM_ADMIN_VIEWS="Status options for components custom admin views"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_DASHBOARD="Status options for components dashboard"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_FILES_FOLDERS="Status options for components files folders"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_MODULES="Status options for components modules"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_MYSQL_TWEAKS="Status options for components mysql tweaks"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_PLACEHOLDERS="Status options for components placeholders"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_PLUGINS="Status options for components plugins"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_SITE_VIEWS="Status options for components site views"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_UPDATES="Status options for components updates"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_CUSTOM_ADMIN_VIEWS="Status options for custom admin views"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_CUSTOM_CODES="Status options for custom codes"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_DYNAMIC_GETS="Status options for dynamic gets"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_FIELDS="Status options for fields"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_FIELDTYPES="Status options for fieldtypes"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_HELP_DOCUMENTS="Status options for help documents"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_COMPONENTS="Status options for joomla components"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_MODULES="Status options for joomla modules"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_MODULES_FILES_FOLDERS_URLS="Status options for joomla modules files folders urls"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_MODULES_UPDATES="Status options for joomla modules updates"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGINS="Status options for joomla plugins"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGINS_FILES_FOLDERS_URLS="Status options for joomla plugins files folders urls"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGINS_UPDATES="Status options for joomla plugins updates"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGIN_GROUPS="Status options for joomla plugin groups"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_LANGUAGES="Status options for languages"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_LANGUAGE_TRANSLATIONS="Status options for language translations"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_LAYOUTS="Status options for layouts"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_LIBRARIES="Status options for libraries"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_LIBRARIES_CONFIG="Status options for libraries config"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_LIBRARIES_FILES_FOLDERS_URLS="Status options for libraries files folders urls"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_PLACEHOLDERS="Status options for placeholders"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_SERVERS="Status options for servers"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_SITE_VIEWS="Status options for site views"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_SNIPPETS="Status options for snippets"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_SNIPPET_TYPES="Status options for snippet types"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_TEMPLATES="Status options for templates"
+COM_COMPONENTBUILDER_FILTER_PUBLISHED_VALIDATION_RULES="Status options for validation rules"
+COM_COMPONENTBUILDER_FILTER_SEARCH="Searchjoomla components"
+COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_CUSTOM_TABS="Search the admin custom tabs items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS="Search the admin fields items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS_CONDITIONS="Search the admin fields conditions items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS_RELATIONS="Search the admin fields relations items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_ADMIN_VIEWS="Search the admin view items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_CLASS_EXTENDINGS="Search the class extends items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_CLASS_METHODS="Search the class method items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_CLASS_PROPERTIES="Search the class property items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_ADMIN_VIEWS="Search the component admin views items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_CONFIG="Search the component config items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_CUSTOM_ADMIN_MENUS="Search the component custom admin menus items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_CUSTOM_ADMIN_VIEWS="Search the component custom admin views items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_DASHBOARD="Search the component dashboard items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_FILES_FOLDERS="Search the component files folders items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_MODULES="Search the component modules items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_MYSQL_TWEAKS="Search the component mysql tweaks items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_PLACEHOLDERS="Search the component placeholders items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_PLUGINS="Search the component plugins items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_SITE_VIEWS="Search the component site views items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_UPDATES="Search the component updates items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_CUSTOM_ADMIN_VIEWS="Search the custom admin view items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_CUSTOM_CODES="Search the custom code items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_DYNAMIC_GETS="Search the dynamic get items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_FIELDS="Search the field items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_FIELDTYPES="Search the fieldtype items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_HELP_DOCUMENTS="Search the help document items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_COMPONENTS="Search the joomla component items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_MODULES="Search the joomla module items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_MODULES_FILES_FOLDERS_URLS="Search the joomla module files folders urls items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_MODULES_UPDATES="Search the joomla module updates items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGINS="Search the joomla plugin items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGINS_FILES_FOLDERS_URLS="Search the joomla plugin files folders urls items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGINS_UPDATES="Search the joomla plugin updates items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGIN_GROUPS="Search the joomla plugin group items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_LANGUAGES="Search the language items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_LANGUAGE_TRANSLATIONS="Search the language translation items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_LAYOUTS="Search the layout items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_LIBRARIES="Search the library items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_LIBRARIES_CONFIG="Search the library config items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_LIBRARIES_FILES_FOLDERS_URLS="Search the library files folders urls items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_PLACEHOLDERS="Search the placeholder items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_SERVERS="Search the server items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_SITE_VIEWS="Search the site view items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_SNIPPETS="Search the snippet items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_SNIPPET_TYPES="Search the snippet type items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_TEMPLATES="Search the template items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SEARCH_VALIDATION_RULES="Search the validation rule items. Prefix with ID: to search for an item by ID."
+COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS="Select Access"
+COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTON="Select Add Custom Button"
+COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_IMPORT="Select Add Custom Import"
+COM_COMPONENTBUILDER_FILTER_SELECT_ADD_FADEIN="Select Add Fadein"
+COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX="Select Add Php Ajax"
+COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_VIEW="Select Add Php View"
+COM_COMPONENTBUILDER_FILTER_SELECT_ADMIN_VIEW="Select Admin View"
+COM_COMPONENTBUILDER_FILTER_SELECT_AUTHOR="Select Author"
+COM_COMPONENTBUILDER_FILTER_SELECT_CLASS_EXTENDS="Select Class Extends"
+COM_COMPONENTBUILDER_FILTER_SELECT_COMMENT_TYPE="Select Comment Type"
+COM_COMPONENTBUILDER_FILTER_SELECT_COMPANYNAME="Select Companyname"
+COM_COMPONENTBUILDER_FILTER_SELECT_COMPONENT="Select Component"
+COM_COMPONENTBUILDER_FILTER_SELECT_DATATYPE="Select Datatype"
+COM_COMPONENTBUILDER_FILTER_SELECT_DYNAMIC_GET="Select Dynamic Get"
+COM_COMPONENTBUILDER_FILTER_SELECT_EXTENSION_TYPE="Select Extension Type"
+COM_COMPONENTBUILDER_FILTER_SELECT_FIELDS_CATEGORIES="Select Fields Categories"
+COM_COMPONENTBUILDER_FILTER_SELECT_FIELDTYPE="Select Fieldtype"
+COM_COMPONENTBUILDER_FILTER_SELECT_FIELDTYPES_CATEGORIES="Select Fieldtypes Categories"
+COM_COMPONENTBUILDER_FILTER_SELECT_GETTYPE="Select Gettype"
+COM_COMPONENTBUILDER_FILTER_SELECT_HOW="Select How"
+COM_COMPONENTBUILDER_FILTER_SELECT_INDEXES="Select Indexes"
+COM_COMPONENTBUILDER_FILTER_SELECT_JOOMLA_PLUGIN_GROUP="Select Joomla Plugin Group"
+COM_COMPONENTBUILDER_FILTER_SELECT_LIBRARY="Select Library"
+COM_COMPONENTBUILDER_FILTER_SELECT_LOCATION="Select Location"
+COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_GET="Select Main Get"
+COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_SOURCE="Select Main Source"
+COM_COMPONENTBUILDER_FILTER_SELECT_NAME="Select Name"
+COM_COMPONENTBUILDER_FILTER_SELECT_NULL_SWITCH="Select Null Switch"
+COM_COMPONENTBUILDER_FILTER_SELECT_PROTOCOL="Select Protocol"
+COM_COMPONENTBUILDER_FILTER_SELECT_SITE_VIEW="Select Site View"
+COM_COMPONENTBUILDER_FILTER_SELECT_STORE="Select Store"
+COM_COMPONENTBUILDER_FILTER_SELECT_TARGET="Select Target"
+COM_COMPONENTBUILDER_FILTER_SELECT_TYPE="Select Type"
+COM_COMPONENTBUILDER_FILTER_SELECT_VISIBILITY="Select Visibility"
+COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_ASCENDING="Short Description ascending"
+COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_DESCENDING="Short Description descending"
+COM_COMPONENTBUILDER_FILTER_SITE_VIEW_ASCENDING="Site View ascending"
+COM_COMPONENTBUILDER_FILTER_SITE_VIEW_DESCENDING="Site View descending"
+COM_COMPONENTBUILDER_FILTER_SOURCE_ASCENDING="Source ascending"
+COM_COMPONENTBUILDER_FILTER_SOURCE_DESCENDING="Source descending"
+COM_COMPONENTBUILDER_FILTER_STORE_ASCENDING="Store ascending"
+COM_COMPONENTBUILDER_FILTER_STORE_DESCENDING="Store descending"
+COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING="System Name ascending"
+COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING="System Name descending"
+COM_COMPONENTBUILDER_FILTER_TARGET_ASCENDING="Target ascending"
+COM_COMPONENTBUILDER_FILTER_TARGET_DESCENDING="Target descending"
+COM_COMPONENTBUILDER_FILTER_TITLE_ASCENDING="Title ascending"
+COM_COMPONENTBUILDER_FILTER_TITLE_DESCENDING="Title descending"
+COM_COMPONENTBUILDER_FILTER_TYPE_ASCENDING="Type ascending"
+COM_COMPONENTBUILDER_FILTER_TYPE_DESCENDING="Type descending"
+COM_COMPONENTBUILDER_FILTER_URL_ASCENDING="Url ascending"
+COM_COMPONENTBUILDER_FILTER_URL_DESCENDING="Url descending"
+COM_COMPONENTBUILDER_FILTER_VALUE_ASCENDING="Value ascending"
+COM_COMPONENTBUILDER_FILTER_VALUE_DESCENDING="Value descending"
+COM_COMPONENTBUILDER_FILTER_VISIBILITY_ASCENDING="Visibility ascending"
+COM_COMPONENTBUILDER_FILTER_VISIBILITY_DESCENDING="Visibility descending"
 COM_COMPONENTBUILDER_FOLDER="Folder"
 COM_COMPONENTBUILDER_FOLDER_BSB_WAS_MOVED_TO_BSB="Folder <b>%s</b> was moved to <b>%s</b>"
 COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVED_TO_BSB="Folder <b>%s</b> was not moved to <b>%s</b>"

admin/models/admin_views.php

@@ -65,8 +65,15 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -84,28 +91,60 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$this->setState('filter.search', $search);
 
 		$add_fadein = $this->getUserStateFromRequest($this->context . '.filter.add_fadein', 'filter_add_fadein');
-		$this->setState('filter.add_fadein', $add_fadein);
+		if ($formSubmited)
+		{
+			$add_fadein = $app->input->post->get('add_fadein');
+			$this->setState('filter.add_fadein', $add_fadein);
+		}
 
 		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
-		$this->setState('filter.type', $type);
+		if ($formSubmited)
+		{
+			$type = $app->input->post->get('type');
+			$this->setState('filter.type', $type);
+		}
 
 		$add_custom_button = $this->getUserStateFromRequest($this->context . '.filter.add_custom_button', 'filter_add_custom_button');
-		$this->setState('filter.add_custom_button', $add_custom_button);
+		if ($formSubmited)
+		{
+			$add_custom_button = $app->input->post->get('add_custom_button');
+			$this->setState('filter.add_custom_button', $add_custom_button);
+		}
 
 		$add_php_ajax = $this->getUserStateFromRequest($this->context . '.filter.add_php_ajax', 'filter_add_php_ajax');
-		$this->setState('filter.add_php_ajax', $add_php_ajax);
+		if ($formSubmited)
+		{
+			$add_php_ajax = $app->input->post->get('add_php_ajax');
+			$this->setState('filter.add_php_ajax', $add_php_ajax);
+		}
 
 		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
-		$this->setState('filter.add_custom_import', $add_custom_import);
+		if ($formSubmited)
+		{
+			$add_custom_import = $app->input->post->get('add_custom_import');
+			$this->setState('filter.add_custom_import', $add_custom_import);
+		}
 
 		$system_name = $this->getUserStateFromRequest($this->context . '.filter.system_name', 'filter_system_name');
-		$this->setState('filter.system_name', $system_name);
+		if ($formSubmited)
+		{
+			$system_name = $app->input->post->get('system_name');
+			$this->setState('filter.system_name', $system_name);
+		}
 
 		$name_single = $this->getUserStateFromRequest($this->context . '.filter.name_single', 'filter_name_single');
-		$this->setState('filter.name_single', $name_single);
+		if ($formSubmited)
+		{
+			$name_single = $app->input->post->get('name_single');
+			$this->setState('filter.name_single', $name_single);
+		}
 
 		$short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description');
-		$this->setState('filter.short_description', $short_description);
+		if ($formSubmited)
+		{
+			$short_description = $app->input->post->get('short_description');
+			$this->setState('filter.short_description', $short_description);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);
@@ -344,6 +383,29 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		{
 			$query->where('a.type = ' . $db->quote($db->escape($_type)));
 		}
+		elseif (ComponentbuilderHelper::checkArray($_type))
+		{
+			// Secure the array for the query
+			$_type = array_map( function ($val) use(&$db) {
+				if (is_numeric($val))
+				{
+					if (is_float($val))
+					{
+						return (float) $val;
+					}
+					else
+					{
+						return (int) $val;
+					}
+				}
+				elseif (ComponentbuilderHelper::checkString($val))
+				{
+					return $db->quote($db->escape($val));
+				}
+			}, $_type);
+			// Filter by the Type Array.
+			$query->where('a.type IN (' . implode(',', $_type) . ')');
+		}
 		// Filter by Add_custom_button.
 		$_add_custom_button = $this->getState('filter.add_custom_button');
 		if (is_numeric($_add_custom_button))

admin/models/admins_custom_tabs.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelAdmins_custom_tabs extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/admins_fields.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelAdmins_fields extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/admins_fields_conditions.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/admins_fields_relations.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelAdmins_fields_relations extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/class_extendings.php

@@ -59,8 +59,15 @@ class ComponentbuilderModelClass_extendings extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -78,10 +85,18 @@ class ComponentbuilderModelClass_extendings extends JModelList
 		$this->setState('filter.search', $search);
 
 		$extension_type = $this->getUserStateFromRequest($this->context . '.filter.extension_type', 'filter_extension_type');
-		$this->setState('filter.extension_type', $extension_type);
+		if ($formSubmited)
+		{
+			$extension_type = $app->input->post->get('extension_type');
+			$this->setState('filter.extension_type', $extension_type);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/class_methods.php

@@ -60,8 +60,15 @@ class ComponentbuilderModelClass_methods extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -79,13 +86,25 @@ class ComponentbuilderModelClass_methods extends JModelList
 		$this->setState('filter.search', $search);
 
 		$visibility = $this->getUserStateFromRequest($this->context . '.filter.visibility', 'filter_visibility');
-		$this->setState('filter.visibility', $visibility);
+		if ($formSubmited)
+		{
+			$visibility = $app->input->post->get('visibility');
+			$this->setState('filter.visibility', $visibility);
+		}
 
 		$extension_type = $this->getUserStateFromRequest($this->context . '.filter.extension_type', 'filter_extension_type');
-		$this->setState('filter.extension_type', $extension_type);
+		if ($formSubmited)
+		{
+			$extension_type = $app->input->post->get('extension_type');
+			$this->setState('filter.extension_type', $extension_type);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/class_properties.php

@@ -60,8 +60,15 @@ class ComponentbuilderModelClass_properties extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -79,13 +86,25 @@ class ComponentbuilderModelClass_properties extends JModelList
 		$this->setState('filter.search', $search);
 
 		$visibility = $this->getUserStateFromRequest($this->context . '.filter.visibility', 'filter_visibility');
-		$this->setState('filter.visibility', $visibility);
+		if ($formSubmited)
+		{
+			$visibility = $app->input->post->get('visibility');
+			$this->setState('filter.visibility', $visibility);
+		}
 
 		$extension_type = $this->getUserStateFromRequest($this->context . '.filter.extension_type', 'filter_extension_type');
-		$this->setState('filter.extension_type', $extension_type);
+		if ($formSubmited)
+		{
+			$extension_type = $app->input->post->get('extension_type');
+			$this->setState('filter.extension_type', $extension_type);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/components_admin_views.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_admin_views extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_config.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_config extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_custom_admin_menus.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_custom_admin_menus extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_custom_admin_views.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_custom_admin_views extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_dashboard.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_dashboard extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_files_folders.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_files_folders extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_modules.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_modules extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_mysql_tweaks.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_mysql_tweaks extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_placeholders.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_placeholders extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_plugins.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_plugins extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_site_views.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_site_views extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/components_updates.php

@@ -57,8 +57,15 @@ class ComponentbuilderModelComponents_updates extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);

admin/models/custom_admin_views.php

@@ -63,8 +63,15 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -82,22 +89,46 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 		$this->setState('filter.search', $search);
 
 		$main_get = $this->getUserStateFromRequest($this->context . '.filter.main_get', 'filter_main_get');
-		$this->setState('filter.main_get', $main_get);
+		if ($formSubmited)
+		{
+			$main_get = $app->input->post->get('main_get');
+			$this->setState('filter.main_get', $main_get);
+		}
 
 		$add_php_ajax = $this->getUserStateFromRequest($this->context . '.filter.add_php_ajax', 'filter_add_php_ajax');
-		$this->setState('filter.add_php_ajax', $add_php_ajax);
+		if ($formSubmited)
+		{
+			$add_php_ajax = $app->input->post->get('add_php_ajax');
+			$this->setState('filter.add_php_ajax', $add_php_ajax);
+		}
 
 		$add_custom_button = $this->getUserStateFromRequest($this->context . '.filter.add_custom_button', 'filter_add_custom_button');
-		$this->setState('filter.add_custom_button', $add_custom_button);
+		if ($formSubmited)
+		{
+			$add_custom_button = $app->input->post->get('add_custom_button');
+			$this->setState('filter.add_custom_button', $add_custom_button);
+		}
 
 		$system_name = $this->getUserStateFromRequest($this->context . '.filter.system_name', 'filter_system_name');
-		$this->setState('filter.system_name', $system_name);
+		if ($formSubmited)
+		{
+			$system_name = $app->input->post->get('system_name');
+			$this->setState('filter.system_name', $system_name);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		$description = $this->getUserStateFromRequest($this->context . '.filter.description', 'filter_description');
-		$this->setState('filter.description', $description);
+		if ($formSubmited)
+		{
+			$description = $app->input->post->get('description');
+			$this->setState('filter.description', $description);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/custom_codes.php

@@ -62,8 +62,15 @@ class ComponentbuilderModelCustom_codes extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -81,19 +88,39 @@ class ComponentbuilderModelCustom_codes extends JModelList
 		$this->setState('filter.search', $search);
 
 		$component = $this->getUserStateFromRequest($this->context . '.filter.component', 'filter_component');
-		$this->setState('filter.component', $component);
+		if ($formSubmited)
+		{
+			$component = $app->input->post->get('component');
+			$this->setState('filter.component', $component);
+		}
 
 		$target = $this->getUserStateFromRequest($this->context . '.filter.target', 'filter_target');
-		$this->setState('filter.target', $target);
+		if ($formSubmited)
+		{
+			$target = $app->input->post->get('target');
+			$this->setState('filter.target', $target);
+		}
 
 		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
-		$this->setState('filter.type', $type);
+		if ($formSubmited)
+		{
+			$type = $app->input->post->get('type');
+			$this->setState('filter.type', $type);
+		}
 
 		$comment_type = $this->getUserStateFromRequest($this->context . '.filter.comment_type', 'filter_comment_type');
-		$this->setState('filter.comment_type', $comment_type);
+		if ($formSubmited)
+		{
+			$comment_type = $app->input->post->get('comment_type');
+			$this->setState('filter.comment_type', $comment_type);
+		}
 
 		$path = $this->getUserStateFromRequest($this->context . '.filter.path', 'filter_path');
-		$this->setState('filter.path', $path);
+		if ($formSubmited)
+		{
+			$path = $app->input->post->get('path');
+			$this->setState('filter.path', $path);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/dynamic_gets.php

@@ -60,8 +60,15 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -79,13 +86,25 @@ class ComponentbuilderModelDynamic_gets extends JModelList
 		$this->setState('filter.search', $search);
 
 		$main_source = $this->getUserStateFromRequest($this->context . '.filter.main_source', 'filter_main_source');
-		$this->setState('filter.main_source', $main_source);
+		if ($formSubmited)
+		{
+			$main_source = $app->input->post->get('main_source');
+			$this->setState('filter.main_source', $main_source);
+		}
 
 		$gettype = $this->getUserStateFromRequest($this->context . '.filter.gettype', 'filter_gettype');
-		$this->setState('filter.gettype', $gettype);
+		if ($formSubmited)
+		{
+			$gettype = $app->input->post->get('gettype');
+			$this->setState('filter.gettype', $gettype);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/fields.php

@@ -66,8 +66,15 @@ class ComponentbuilderModelFields extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -85,19 +92,39 @@ class ComponentbuilderModelFields extends JModelList
 		$this->setState('filter.search', $search);
 
 		$fieldtype = $this->getUserStateFromRequest($this->context . '.filter.fieldtype', 'filter_fieldtype');
-		$this->setState('filter.fieldtype', $fieldtype);
+		if ($formSubmited)
+		{
+			$fieldtype = $app->input->post->get('fieldtype');
+			$this->setState('filter.fieldtype', $fieldtype);
+		}
 
 		$datatype = $this->getUserStateFromRequest($this->context . '.filter.datatype', 'filter_datatype');
-		$this->setState('filter.datatype', $datatype);
+		if ($formSubmited)
+		{
+			$datatype = $app->input->post->get('datatype');
+			$this->setState('filter.datatype', $datatype);
+		}
 
 		$indexes = $this->getUserStateFromRequest($this->context . '.filter.indexes', 'filter_indexes');
-		$this->setState('filter.indexes', $indexes);
+		if ($formSubmited)
+		{
+			$indexes = $app->input->post->get('indexes');
+			$this->setState('filter.indexes', $indexes);
+		}
 
 		$null_switch = $this->getUserStateFromRequest($this->context . '.filter.null_switch', 'filter_null_switch');
-		$this->setState('filter.null_switch', $null_switch);
+		if ($formSubmited)
+		{
+			$null_switch = $app->input->post->get('null_switch');
+			$this->setState('filter.null_switch', $null_switch);
+		}
 
 		$store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store');
-		$this->setState('filter.store', $store);
+		if ($formSubmited)
+		{
+			$store = $app->input->post->get('store');
+			$this->setState('filter.store', $store);
+		}
 
 		$category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
 		$this->setState('filter.category', $category);
@@ -106,10 +133,18 @@ class ComponentbuilderModelFields extends JModelList
 		$this->setState('filter.category_id', $categoryId);
 
 		$catid = $this->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
-		$this->setState('filter.catid', $catid);
+		if ($formSubmited)
+		{
+			$catid = $app->input->post->get('catid');
+			$this->setState('filter.catid', $catid);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/fields/adminviewsfilteraddcustombutton.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Adminviewsfilteraddcustombutton Form Field class for the Componentbuilder component
+ */
+class JFormFieldAdminviewsfilteraddcustombutton extends JFormFieldList
+{
+	/**
+	 * The adminviewsfilteraddcustombutton field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'adminviewsfilteraddcustombutton';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_custom_button'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('add_custom_button') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTON') . ' -');
+			foreach ($results as $add_custom_button)
+			{
+				// Translate the add_custom_button selection
+				$text = $model->selectionTranslation($add_custom_button,'add_custom_button');
+				// Now add the add_custom_button and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/adminviewsfilteraddcustomimport.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Adminviewsfilteraddcustomimport Form Field class for the Componentbuilder component
+ */
+class JFormFieldAdminviewsfilteraddcustomimport extends JFormFieldList
+{
+	/**
+	 * The adminviewsfilteraddcustomimport field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'adminviewsfilteraddcustomimport';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_custom_import'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('add_custom_import') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_IMPORT') . ' -');
+			foreach ($results as $add_custom_import)
+			{
+				// Translate the add_custom_import selection
+				$text = $model->selectionTranslation($add_custom_import,'add_custom_import');
+				// Now add the add_custom_import and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_custom_import, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/adminviewsfilteraddfadein.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Adminviewsfilteraddfadein Form Field class for the Componentbuilder component
+ */
+class JFormFieldAdminviewsfilteraddfadein extends JFormFieldList
+{
+	/**
+	 * The adminviewsfilteraddfadein field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'adminviewsfilteraddfadein';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_fadein'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('add_fadein') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_FADEIN') . ' -');
+			foreach ($results as $add_fadein)
+			{
+				// Translate the add_fadein selection
+				$text = $model->selectionTranslation($add_fadein,'add_fadein');
+				// Now add the add_fadein and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_fadein, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/adminviewsfilteraddphpajax.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Adminviewsfilteraddphpajax Form Field class for the Componentbuilder component
+ */
+class JFormFieldAdminviewsfilteraddphpajax extends JFormFieldList
+{
+	/**
+	 * The adminviewsfilteraddphpajax field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'adminviewsfilteraddphpajax';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_php_ajax'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('add_php_ajax') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX') . ' -');
+			foreach ($results as $add_php_ajax)
+			{
+				// Translate the add_php_ajax selection
+				$text = $model->selectionTranslation($add_php_ajax,'add_php_ajax');
+				// Now add the add_php_ajax and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/adminviewsfiltertype.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Adminviewsfiltertype Form Field class for the Componentbuilder component
+ */
+class JFormFieldAdminviewsfiltertype extends JFormFieldList
+{
+	/**
+	 * The adminviewsfiltertype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'adminviewsfiltertype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('type'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			foreach ($results as $type)
+			{
+				// Translate the type selection
+				$text = $model->selectionTranslation($type,'type');
+				// Now add the type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/classextendingsfilterextensiontype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Classextendingsfilterextensiontype Form Field class for the Componentbuilder component
+ */
+class JFormFieldClassextendingsfilterextensiontype extends JFormFieldList
+{
+	/**
+	 * The classextendingsfilterextensiontype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'classextendingsfilterextensiontype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('extension_type'));
+		$query->from($db->quoteName('#__componentbuilder_class_extends'));
+		$query->order($db->quoteName('extension_type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get class_extendingsmodel
+			$model = ComponentbuilderHelper::getModel('class_extendings');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_EXTENSION_TYPE') . ' -');
+			foreach ($results as $extension_type)
+			{
+				// Translate the extension_type selection
+				$text = $model->selectionTranslation($extension_type,'extension_type');
+				// Now add the extension_type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/classmethodsfilterextensiontype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Classmethodsfilterextensiontype Form Field class for the Componentbuilder component
+ */
+class JFormFieldClassmethodsfilterextensiontype extends JFormFieldList
+{
+	/**
+	 * The classmethodsfilterextensiontype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'classmethodsfilterextensiontype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('extension_type'));
+		$query->from($db->quoteName('#__componentbuilder_class_method'));
+		$query->order($db->quoteName('extension_type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get class_methodsmodel
+			$model = ComponentbuilderHelper::getModel('class_methods');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_EXTENSION_TYPE') . ' -');
+			foreach ($results as $extension_type)
+			{
+				// Translate the extension_type selection
+				$text = $model->selectionTranslation($extension_type,'extension_type');
+				// Now add the extension_type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/classmethodsfiltervisibility.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Classmethodsfiltervisibility Form Field class for the Componentbuilder component
+ */
+class JFormFieldClassmethodsfiltervisibility extends JFormFieldList
+{
+	/**
+	 * The classmethodsfiltervisibility field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'classmethodsfiltervisibility';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('visibility'));
+		$query->from($db->quoteName('#__componentbuilder_class_method'));
+		$query->order($db->quoteName('visibility') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get class_methodsmodel
+			$model = ComponentbuilderHelper::getModel('class_methods');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_VISIBILITY') . ' -');
+			foreach ($results as $visibility)
+			{
+				// Translate the visibility selection
+				$text = $model->selectionTranslation($visibility,'visibility');
+				// Now add the visibility and its text to the options array
+				$_filter[] = JHtml::_('select.option', $visibility, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/classpropertiesfilterextensiontype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Classpropertiesfilterextensiontype Form Field class for the Componentbuilder component
+ */
+class JFormFieldClasspropertiesfilterextensiontype extends JFormFieldList
+{
+	/**
+	 * The classpropertiesfilterextensiontype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'classpropertiesfilterextensiontype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('extension_type'));
+		$query->from($db->quoteName('#__componentbuilder_class_property'));
+		$query->order($db->quoteName('extension_type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get class_propertiesmodel
+			$model = ComponentbuilderHelper::getModel('class_properties');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_EXTENSION_TYPE') . ' -');
+			foreach ($results as $extension_type)
+			{
+				// Translate the extension_type selection
+				$text = $model->selectionTranslation($extension_type,'extension_type');
+				// Now add the extension_type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $extension_type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/classpropertiesfiltervisibility.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Classpropertiesfiltervisibility Form Field class for the Componentbuilder component
+ */
+class JFormFieldClasspropertiesfiltervisibility extends JFormFieldList
+{
+	/**
+	 * The classpropertiesfiltervisibility field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'classpropertiesfiltervisibility';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('visibility'));
+		$query->from($db->quoteName('#__componentbuilder_class_property'));
+		$query->order($db->quoteName('visibility') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get class_propertiesmodel
+			$model = ComponentbuilderHelper::getModel('class_properties');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_VISIBILITY') . ' -');
+			foreach ($results as $visibility)
+			{
+				// Translate the visibility selection
+				$text = $model->selectionTranslation($visibility,'visibility');
+				// Now add the visibility and its text to the options array
+				$_filter[] = JHtml::_('select.option', $visibility, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/customadminviewsfilteraddcustombutton.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Customadminviewsfilteraddcustombutton Form Field class for the Componentbuilder component
+ */
+class JFormFieldCustomadminviewsfilteraddcustombutton extends JFormFieldList
+{
+	/**
+	 * The customadminviewsfilteraddcustombutton field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'customadminviewsfilteraddcustombutton';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_custom_button'));
+		$query->from($db->quoteName('#__componentbuilder_custom_admin_view'));
+		$query->order($db->quoteName('add_custom_button') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get custom_admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('custom_admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTON') . ' -');
+			foreach ($results as $add_custom_button)
+			{
+				// Translate the add_custom_button selection
+				$text = $model->selectionTranslation($add_custom_button,'add_custom_button');
+				// Now add the add_custom_button and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/customadminviewsfilteraddphpajax.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Customadminviewsfilteraddphpajax Form Field class for the Componentbuilder component
+ */
+class JFormFieldCustomadminviewsfilteraddphpajax extends JFormFieldList
+{
+	/**
+	 * The customadminviewsfilteraddphpajax field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'customadminviewsfilteraddphpajax';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_php_ajax'));
+		$query->from($db->quoteName('#__componentbuilder_custom_admin_view'));
+		$query->order($db->quoteName('add_php_ajax') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get custom_admin_viewsmodel
+			$model = ComponentbuilderHelper::getModel('custom_admin_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX') . ' -');
+			foreach ($results as $add_php_ajax)
+			{
+				// Translate the add_php_ajax selection
+				$text = $model->selectionTranslation($add_php_ajax,'add_php_ajax');
+				// Now add the add_php_ajax and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/customcodesfiltercommenttype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Customcodesfiltercommenttype Form Field class for the Componentbuilder component
+ */
+class JFormFieldCustomcodesfiltercommenttype extends JFormFieldList
+{
+	/**
+	 * The customcodesfiltercommenttype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'customcodesfiltercommenttype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('comment_type'));
+		$query->from($db->quoteName('#__componentbuilder_custom_code'));
+		$query->order($db->quoteName('comment_type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get custom_codesmodel
+			$model = ComponentbuilderHelper::getModel('custom_codes');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_COMMENT_TYPE') . ' -');
+			foreach ($results as $comment_type)
+			{
+				// Translate the comment_type selection
+				$text = $model->selectionTranslation($comment_type,'comment_type');
+				// Now add the comment_type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $comment_type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/customcodesfiltertarget.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Customcodesfiltertarget Form Field class for the Componentbuilder component
+ */
+class JFormFieldCustomcodesfiltertarget extends JFormFieldList
+{
+	/**
+	 * The customcodesfiltertarget field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'customcodesfiltertarget';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('target'));
+		$query->from($db->quoteName('#__componentbuilder_custom_code'));
+		$query->order($db->quoteName('target') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get custom_codesmodel
+			$model = ComponentbuilderHelper::getModel('custom_codes');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET') . ' -');
+			foreach ($results as $target)
+			{
+				// Translate the target selection
+				$text = $model->selectionTranslation($target,'target');
+				// Now add the target and its text to the options array
+				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/customcodesfiltertype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Customcodesfiltertype Form Field class for the Componentbuilder component
+ */
+class JFormFieldCustomcodesfiltertype extends JFormFieldList
+{
+	/**
+	 * The customcodesfiltertype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'customcodesfiltertype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('type'));
+		$query->from($db->quoteName('#__componentbuilder_custom_code'));
+		$query->order($db->quoteName('type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get custom_codesmodel
+			$model = ComponentbuilderHelper::getModel('custom_codes');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
+			foreach ($results as $type)
+			{
+				// Translate the type selection
+				$text = $model->selectionTranslation($type,'type');
+				// Now add the type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/dynamicgetsfiltergettype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Dynamicgetsfiltergettype Form Field class for the Componentbuilder component
+ */
+class JFormFieldDynamicgetsfiltergettype extends JFormFieldList
+{
+	/**
+	 * The dynamicgetsfiltergettype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'dynamicgetsfiltergettype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('gettype'));
+		$query->from($db->quoteName('#__componentbuilder_dynamic_get'));
+		$query->order($db->quoteName('gettype') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get dynamic_getsmodel
+			$model = ComponentbuilderHelper::getModel('dynamic_gets');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_GETTYPE') . ' -');
+			foreach ($results as $gettype)
+			{
+				// Translate the gettype selection
+				$text = $model->selectionTranslation($gettype,'gettype');
+				// Now add the gettype and its text to the options array
+				$_filter[] = JHtml::_('select.option', $gettype, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/dynamicgetsfiltermainsource.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Dynamicgetsfiltermainsource Form Field class for the Componentbuilder component
+ */
+class JFormFieldDynamicgetsfiltermainsource extends JFormFieldList
+{
+	/**
+	 * The dynamicgetsfiltermainsource field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'dynamicgetsfiltermainsource';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('main_source'));
+		$query->from($db->quoteName('#__componentbuilder_dynamic_get'));
+		$query->order($db->quoteName('main_source') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get dynamic_getsmodel
+			$model = ComponentbuilderHelper::getModel('dynamic_gets');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_SOURCE') . ' -');
+			foreach ($results as $main_source)
+			{
+				// Translate the main_source selection
+				$text = $model->selectionTranslation($main_source,'main_source');
+				// Now add the main_source and its text to the options array
+				$_filter[] = JHtml::_('select.option', $main_source, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/fieldsfilterdatatype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fieldsfilterdatatype Form Field class for the Componentbuilder component
+ */
+class JFormFieldFieldsfilterdatatype extends JFormFieldList
+{
+	/**
+	 * The fieldsfilterdatatype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'fieldsfilterdatatype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('datatype'));
+		$query->from($db->quoteName('#__componentbuilder_field'));
+		$query->order($db->quoteName('datatype') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get fieldsmodel
+			$model = ComponentbuilderHelper::getModel('fields');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_DATATYPE') . ' -');
+			foreach ($results as $datatype)
+			{
+				// Translate the datatype selection
+				$text = $model->selectionTranslation($datatype,'datatype');
+				// Now add the datatype and its text to the options array
+				$_filter[] = JHtml::_('select.option', $datatype, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/fieldsfilterindexes.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fieldsfilterindexes Form Field class for the Componentbuilder component
+ */
+class JFormFieldFieldsfilterindexes extends JFormFieldList
+{
+	/**
+	 * The fieldsfilterindexes field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'fieldsfilterindexes';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('indexes'));
+		$query->from($db->quoteName('#__componentbuilder_field'));
+		$query->order($db->quoteName('indexes') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get fieldsmodel
+			$model = ComponentbuilderHelper::getModel('fields');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_INDEXES') . ' -');
+			foreach ($results as $indexes)
+			{
+				// Translate the indexes selection
+				$text = $model->selectionTranslation($indexes,'indexes');
+				// Now add the indexes and its text to the options array
+				$_filter[] = JHtml::_('select.option', $indexes, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/fieldsfilternullswitch.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fieldsfilternullswitch Form Field class for the Componentbuilder component
+ */
+class JFormFieldFieldsfilternullswitch extends JFormFieldList
+{
+	/**
+	 * The fieldsfilternullswitch field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'fieldsfilternullswitch';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('null_switch'));
+		$query->from($db->quoteName('#__componentbuilder_field'));
+		$query->order($db->quoteName('null_switch') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get fieldsmodel
+			$model = ComponentbuilderHelper::getModel('fields');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_NULL_SWITCH') . ' -');
+			foreach ($results as $null_switch)
+			{
+				// Translate the null_switch selection
+				$text = $model->selectionTranslation($null_switch,'null_switch');
+				// Now add the null_switch and its text to the options array
+				$_filter[] = JHtml::_('select.option', $null_switch, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/fieldsfilterstore.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fieldsfilterstore Form Field class for the Componentbuilder component
+ */
+class JFormFieldFieldsfilterstore extends JFormFieldList
+{
+	/**
+	 * The fieldsfilterstore field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'fieldsfilterstore';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('store'));
+		$query->from($db->quoteName('#__componentbuilder_field'));
+		$query->order($db->quoteName('store') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get fieldsmodel
+			$model = ComponentbuilderHelper::getModel('fields');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_STORE') . ' -');
+			foreach ($results as $store)
+			{
+				// Translate the store selection
+				$text = $model->selectionTranslation($store,'store');
+				// Now add the store and its text to the options array
+				$_filter[] = JHtml::_('select.option', $store, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/helpdocumentsfilterlocation.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Helpdocumentsfilterlocation Form Field class for the Componentbuilder component
+ */
+class JFormFieldHelpdocumentsfilterlocation extends JFormFieldList
+{
+	/**
+	 * The helpdocumentsfilterlocation field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'helpdocumentsfilterlocation';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('location'));
+		$query->from($db->quoteName('#__componentbuilder_help_document'));
+		$query->order($db->quoteName('location') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get help_documentsmodel
+			$model = ComponentbuilderHelper::getModel('help_documents');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_LOCATION') . ' -');
+			foreach ($results as $location)
+			{
+				// Translate the location selection
+				$text = $model->selectionTranslation($location,'location');
+				// Now add the location and its text to the options array
+				$_filter[] = JHtml::_('select.option', $location, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/helpdocumentsfiltertype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Helpdocumentsfiltertype Form Field class for the Componentbuilder component
+ */
+class JFormFieldHelpdocumentsfiltertype extends JFormFieldList
+{
+	/**
+	 * The helpdocumentsfiltertype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'helpdocumentsfiltertype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('type'));
+		$query->from($db->quoteName('#__componentbuilder_help_document'));
+		$query->order($db->quoteName('type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get help_documentsmodel
+			$model = ComponentbuilderHelper::getModel('help_documents');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
+			foreach ($results as $type)
+			{
+				// Translate the type selection
+				$text = $model->selectionTranslation($type,'type');
+				// Now add the type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/joomlacomponentsfilterauthor.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Joomlacomponentsfilterauthor Form Field class for the Componentbuilder component
+ */
+class JFormFieldJoomlacomponentsfilterauthor extends JFormFieldList
+{
+	/**
+	 * The joomlacomponentsfilterauthor field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'joomlacomponentsfilterauthor';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('author'));
+		$query->from($db->quoteName('#__componentbuilder_joomla_component'));
+		$query->order($db->quoteName('author') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_AUTHOR') . ' -');
+			foreach ($results as $author)
+			{
+				// Now add the author and its text to the options array
+				$_filter[] = JHtml::_('select.option', $author, $author);
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/joomlacomponentsfiltercompanyname.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Joomlacomponentsfiltercompanyname Form Field class for the Componentbuilder component
+ */
+class JFormFieldJoomlacomponentsfiltercompanyname extends JFormFieldList
+{
+	/**
+	 * The joomlacomponentsfiltercompanyname field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'joomlacomponentsfiltercompanyname';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('companyname'));
+		$query->from($db->quoteName('#__componentbuilder_joomla_component'));
+		$query->order($db->quoteName('companyname') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_COMPANYNAME') . ' -');
+			foreach ($results as $companyname)
+			{
+				// Now add the companyname and its text to the options array
+				$_filter[] = JHtml::_('select.option', $companyname, $companyname);
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/joomlamodulesfiltertarget.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Joomlamodulesfiltertarget Form Field class for the Componentbuilder component
+ */
+class JFormFieldJoomlamodulesfiltertarget extends JFormFieldList
+{
+	/**
+	 * The joomlamodulesfiltertarget field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'joomlamodulesfiltertarget';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('target'));
+		$query->from($db->quoteName('#__componentbuilder_joomla_module'));
+		$query->order($db->quoteName('target') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get joomla_modulesmodel
+			$model = ComponentbuilderHelper::getModel('joomla_modules');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET') . ' -');
+			foreach ($results as $target)
+			{
+				// Translate the target selection
+				$text = $model->selectionTranslation($target,'target');
+				// Now add the target and its text to the options array
+				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/layoutsfilteraddphpview.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Layoutsfilteraddphpview Form Field class for the Componentbuilder component
+ */
+class JFormFieldLayoutsfilteraddphpview extends JFormFieldList
+{
+	/**
+	 * The layoutsfilteraddphpview field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'layoutsfilteraddphpview';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_php_view'));
+		$query->from($db->quoteName('#__componentbuilder_layout'));
+		$query->order($db->quoteName('add_php_view') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get layoutsmodel
+			$model = ComponentbuilderHelper::getModel('layouts');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_VIEW') . ' -');
+			foreach ($results as $add_php_view)
+			{
+				// Translate the add_php_view selection
+				$text = $model->selectionTranslation($add_php_view,'add_php_view');
+				// Now add the add_php_view and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_php_view, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/librariesfiltertarget.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Librariesfiltertarget Form Field class for the Componentbuilder component
+ */
+class JFormFieldLibrariesfiltertarget extends JFormFieldList
+{
+	/**
+	 * The librariesfiltertarget field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'librariesfiltertarget';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('target'));
+		$query->from($db->quoteName('#__componentbuilder_library'));
+		$query->order($db->quoteName('target') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get librariesmodel
+			$model = ComponentbuilderHelper::getModel('libraries');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TARGET') . ' -');
+			foreach ($results as $target)
+			{
+				// Translate the target selection
+				$text = $model->selectionTranslation($target,'target');
+				// Now add the target and its text to the options array
+				$_filter[] = JHtml::_('select.option', $target, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/librariesfiltertype.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Librariesfiltertype Form Field class for the Componentbuilder component
+ */
+class JFormFieldLibrariesfiltertype extends JFormFieldList
+{
+	/**
+	 * The librariesfiltertype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'librariesfiltertype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('type'));
+		$query->from($db->quoteName('#__componentbuilder_library'));
+		$query->order($db->quoteName('type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get librariesmodel
+			$model = ComponentbuilderHelper::getModel('libraries');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -');
+			foreach ($results as $type)
+			{
+				// Translate the type selection
+				$text = $model->selectionTranslation($type,'type');
+				// Now add the type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/serversfiltername.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Serversfiltername Form Field class for the Componentbuilder component
+ */
+class JFormFieldServersfiltername extends JFormFieldList
+{
+	/**
+	 * The serversfiltername field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'serversfiltername';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('name'));
+		$query->from($db->quoteName('#__componentbuilder_server'));
+		$query->order($db->quoteName('name') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_NAME') . ' -');
+			foreach ($results as $name)
+			{
+				// Now add the name and its text to the options array
+				$_filter[] = JHtml::_('select.option', $name, $name);
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/serversfilterprotocol.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Serversfilterprotocol Form Field class for the Componentbuilder component
+ */
+class JFormFieldServersfilterprotocol extends JFormFieldList
+{
+	/**
+	 * The serversfilterprotocol field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'serversfilterprotocol';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('protocol'));
+		$query->from($db->quoteName('#__componentbuilder_server'));
+		$query->order($db->quoteName('protocol') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get serversmodel
+			$model = ComponentbuilderHelper::getModel('servers');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_PROTOCOL') . ' -');
+			foreach ($results as $protocol)
+			{
+				// Translate the protocol selection
+				$text = $model->selectionTranslation($protocol,'protocol');
+				// Now add the protocol and its text to the options array
+				$_filter[] = JHtml::_('select.option', $protocol, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/siteviewsfilteraddcustombutton.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Siteviewsfilteraddcustombutton Form Field class for the Componentbuilder component
+ */
+class JFormFieldSiteviewsfilteraddcustombutton extends JFormFieldList
+{
+	/**
+	 * The siteviewsfilteraddcustombutton field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'siteviewsfilteraddcustombutton';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_custom_button'));
+		$query->from($db->quoteName('#__componentbuilder_site_view'));
+		$query->order($db->quoteName('add_custom_button') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get site_viewsmodel
+			$model = ComponentbuilderHelper::getModel('site_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_CUSTOM_BUTTON') . ' -');
+			foreach ($results as $add_custom_button)
+			{
+				// Translate the add_custom_button selection
+				$text = $model->selectionTranslation($add_custom_button,'add_custom_button');
+				// Now add the add_custom_button and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_custom_button, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/siteviewsfilteraddphpajax.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Siteviewsfilteraddphpajax Form Field class for the Componentbuilder component
+ */
+class JFormFieldSiteviewsfilteraddphpajax extends JFormFieldList
+{
+	/**
+	 * The siteviewsfilteraddphpajax field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'siteviewsfilteraddphpajax';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_php_ajax'));
+		$query->from($db->quoteName('#__componentbuilder_site_view'));
+		$query->order($db->quoteName('add_php_ajax') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get site_viewsmodel
+			$model = ComponentbuilderHelper::getModel('site_views');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_AJAX') . ' -');
+			foreach ($results as $add_php_ajax)
+			{
+				// Translate the add_php_ajax selection
+				$text = $model->selectionTranslation($add_php_ajax,'add_php_ajax');
+				// Now add the add_php_ajax and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_php_ajax, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fields/templatesfilteraddphpview.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Templatesfilteraddphpview Form Field class for the Componentbuilder component
+ */
+class JFormFieldTemplatesfilteraddphpview extends JFormFieldList
+{
+	/**
+	 * The templatesfilteraddphpview field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'templatesfilteraddphpview';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('add_php_view'));
+		$query->from($db->quoteName('#__componentbuilder_template'));
+		$query->order($db->quoteName('add_php_view') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get templatesmodel
+			$model = ComponentbuilderHelper::getModel('templates');
+			$results = array_unique($results);
+			$_filter = array();
+			$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ADD_PHP_VIEW') . ' -');
+			foreach ($results as $add_php_view)
+			{
+				// Translate the add_php_view selection
+				$text = $model->selectionTranslation($add_php_view,'add_php_view');
+				// Now add the add_php_view and its text to the options array
+				$_filter[] = JHtml::_('select.option', $add_php_view, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+}

admin/models/fieldtypes.php

@@ -62,8 +62,15 @@ class ComponentbuilderModelFieldtypes extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -87,13 +94,25 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$this->setState('filter.category_id', $categoryId);
 
 		$catid = $this->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
-		$this->setState('filter.catid', $catid);
+		if ($formSubmited)
+		{
+			$catid = $app->input->post->get('catid');
+			$this->setState('filter.catid', $catid);
+		}
 
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
-		$this->setState('filter.name', $name);
+		if ($formSubmited)
+		{
+			$name = $app->input->post->get('name');
+			$this->setState('filter.name', $name);
+		}
 
 		$short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description');
-		$this->setState('filter.short_description', $short_description);
+		if ($formSubmited)
+		{
+			$short_description = $app->input->post->get('short_description');
+			$this->setState('filter.short_description', $short_description);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);

admin/models/forms/filter_admin_views.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_ADMIN_VIEWS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMIN_VIEWS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewsfilteraddfadein"
+			name="add_fadein"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewsfiltertype"
+			name="type"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL"
+			class="multipleAdminviewsfiltertype"
+			multiple="true"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewsfilteraddcustombutton"
+			name="add_custom_button"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewsfilteraddphpajax"
+			name="add_php_ajax"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewsfilteraddcustomimport"
+			name="add_custom_import"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.system_name ASC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING</option>
+			<option value="a.system_name DESC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING</option>
+			<option value="a.name_single ASC">COM_COMPONENTBUILDER_FILTER_NAME_SINGLE_ASCENDING</option>
+			<option value="a.name_single DESC">COM_COMPONENTBUILDER_FILTER_NAME_SINGLE_DESCENDING</option>
+			<option value="a.short_description ASC">COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_ASCENDING</option>
+			<option value="a.short_description DESC">COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_admins_custom_tabs.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_CUSTOM_TABS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_CUSTOM_TABS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_admins_fields.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_FIELDS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_admins_fields_conditions.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS_CONDITIONS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_FIELDS_CONDITIONS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_admins_fields_relations.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_ADMINS_FIELDS_RELATIONS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_ADMINS_FIELDS_RELATIONS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_class_extendings.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_CLASS_EXTENDINGS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_CLASS_EXTENDINGS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classextendingsfilterextensiontype"
+			name="extension_type"
+			label="COM_COMPONENTBUILDER_CLASS_EXTENDS_EXTENSION_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.extension_type ASC">COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_ASCENDING</option>
+			<option value="a.extension_type DESC">COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_class_methods.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_CLASS_METHODS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_CLASS_METHODS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classmethodsfiltervisibility"
+			name="visibility"
+			label="COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classmethodsfilterextensiontype"
+			name="extension_type"
+			label="COM_COMPONENTBUILDER_CLASS_METHOD_EXTENSION_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.visibility ASC">COM_COMPONENTBUILDER_FILTER_VISIBILITY_ASCENDING</option>
+			<option value="a.visibility DESC">COM_COMPONENTBUILDER_FILTER_VISIBILITY_DESCENDING</option>
+			<option value="a.extension_type ASC">COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_ASCENDING</option>
+			<option value="a.extension_type DESC">COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_class_properties.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_CLASS_PROPERTIES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_CLASS_PROPERTIES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classpropertiesfiltervisibility"
+			name="visibility"
+			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classpropertiesfilterextensiontype"
+			name="extension_type"
+			label="COM_COMPONENTBUILDER_CLASS_PROPERTY_EXTENSION_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.visibility ASC">COM_COMPONENTBUILDER_FILTER_VISIBILITY_ASCENDING</option>
+			<option value="a.visibility DESC">COM_COMPONENTBUILDER_FILTER_VISIBILITY_DESCENDING</option>
+			<option value="a.extension_type ASC">COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_ASCENDING</option>
+			<option value="a.extension_type DESC">COM_COMPONENTBUILDER_FILTER_EXTENSION_TYPE_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_admin_views.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_ADMIN_VIEWS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_ADMIN_VIEWS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_config.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_CONFIG"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_CONFIG"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_custom_admin_menus.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_CUSTOM_ADMIN_MENUS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_CUSTOM_ADMIN_MENUS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_custom_admin_views.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_CUSTOM_ADMIN_VIEWS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_CUSTOM_ADMIN_VIEWS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_dashboard.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_DASHBOARD"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_DASHBOARD"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_files_folders.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_FILES_FOLDERS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_FILES_FOLDERS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_modules.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_MODULES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_MODULES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_mysql_tweaks.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_MYSQL_TWEAKS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_MYSQL_TWEAKS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_placeholders.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_PLACEHOLDERS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_PLACEHOLDERS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_plugins.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_PLUGINS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_PLUGINS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_site_views.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_SITE_VIEWS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_SITE_VIEWS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_components_updates.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_COMPONENTS_UPDATES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_COMPONENTS_UPDATES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_custom_admin_views.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_CUSTOM_ADMIN_VIEWS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_CUSTOM_ADMIN_VIEWS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="maingets"
+			name="main_get"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="customadminviewsfilteraddphpajax"
+			name="add_php_ajax"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="customadminviewsfilteraddcustombutton"
+			name="add_custom_button"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.system_name ASC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING</option>
+			<option value="a.system_name DESC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.description ASC">COM_COMPONENTBUILDER_FILTER_DESCRIPTION_ASCENDING</option>
+			<option value="a.description DESC">COM_COMPONENTBUILDER_FILTER_DESCRIPTION_DESCENDING</option>
+			<option value="g.name ASC">COM_COMPONENTBUILDER_FILTER_MAIN_GET_ASCENDING</option>
+			<option value="g.name DESC">COM_COMPONENTBUILDER_FILTER_MAIN_GET_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_custom_codes.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_CUSTOM_CODES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_CUSTOM_CODES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="component"
+			name="component"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="customcodesfiltertarget"
+			name="target"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="customcodesfiltertype"
+			name="type"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="customcodesfiltercommenttype"
+			name="comment_type"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="g.system_name ASC">COM_COMPONENTBUILDER_FILTER_COMPONENT_ASCENDING</option>
+			<option value="g.system_name DESC">COM_COMPONENTBUILDER_FILTER_COMPONENT_DESCENDING</option>
+			<option value="a.path ASC">COM_COMPONENTBUILDER_FILTER_PATH_ASCENDING</option>
+			<option value="a.path DESC">COM_COMPONENTBUILDER_FILTER_PATH_DESCENDING</option>
+			<option value="a.target ASC">COM_COMPONENTBUILDER_FILTER_TARGET_ASCENDING</option>
+			<option value="a.target DESC">COM_COMPONENTBUILDER_FILTER_TARGET_DESCENDING</option>
+			<option value="a.type ASC">COM_COMPONENTBUILDER_FILTER_TYPE_ASCENDING</option>
+			<option value="a.type DESC">COM_COMPONENTBUILDER_FILTER_TYPE_DESCENDING</option>
+			<option value="a.comment_type ASC">COM_COMPONENTBUILDER_FILTER_COMMENT_TYPE_ASCENDING</option>
+			<option value="a.comment_type DESC">COM_COMPONENTBUILDER_FILTER_COMMENT_TYPE_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_dynamic_gets.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_DYNAMIC_GETS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_DYNAMIC_GETS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="dynamicgetsfiltermainsource"
+			name="main_source"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="dynamicgetsfiltergettype"
+			name="gettype"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.main_source ASC">COM_COMPONENTBUILDER_FILTER_MAIN_SOURCE_ASCENDING</option>
+			<option value="a.main_source DESC">COM_COMPONENTBUILDER_FILTER_MAIN_SOURCE_DESCENDING</option>
+			<option value="a.gettype ASC">COM_COMPONENTBUILDER_FILTER_GETTYPE_ASCENDING</option>
+			<option value="a.gettype DESC">COM_COMPONENTBUILDER_FILTER_GETTYPE_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_fields.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_FIELDS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_FIELDS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="category"
+			name="category_id"
+			label="COM_COMPONENTBUILDER_FIELD_FIELDS_CATEGORIES"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_componentbuilder.field"
+			onchange="this.form.submit();"
+			published="0,1,2"
+		/>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="fieldtypes"
+			name="fieldtype"
+			label="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="fieldsfilterdatatype"
+			name="datatype"
+			label="COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="fieldsfilterindexes"
+			name="indexes"
+			label="COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="fieldsfilternullswitch"
+			name="null_switch"
+			label="COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="fieldsfilterstore"
+			name="store"
+			label="COM_COMPONENTBUILDER_FIELD_STORE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="g.name ASC">COM_COMPONENTBUILDER_FILTER_FIELDTYPE_ASCENDING</option>
+			<option value="g.name DESC">COM_COMPONENTBUILDER_FILTER_FIELDTYPE_DESCENDING</option>
+			<option value="a.datatype ASC">COM_COMPONENTBUILDER_FILTER_DATATYPE_ASCENDING</option>
+			<option value="a.datatype DESC">COM_COMPONENTBUILDER_FILTER_DATATYPE_DESCENDING</option>
+			<option value="a.indexes ASC">COM_COMPONENTBUILDER_FILTER_INDEXES_ASCENDING</option>
+			<option value="a.indexes DESC">COM_COMPONENTBUILDER_FILTER_INDEXES_DESCENDING</option>
+			<option value="a.null_switch ASC">COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_ASCENDING</option>
+			<option value="a.null_switch DESC">COM_COMPONENTBUILDER_FILTER_NULL_SWITCH_DESCENDING</option>
+			<option value="a.store ASC">COM_COMPONENTBUILDER_FILTER_STORE_ASCENDING</option>
+			<option value="a.store DESC">COM_COMPONENTBUILDER_FILTER_STORE_DESCENDING</option>
+			<option value="category_title ASC">COM_COMPONENTBUILDER_FILTER_FIELDS_CATEGORIES_ASCENDING</option>
+			<option value="category_title DESC">COM_COMPONENTBUILDER_FILTER_FIELDS_CATEGORIES_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_fieldtypes.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_FIELDTYPES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_FIELDTYPES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="category"
+			name="category_id"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPES_CATEGORIES"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_componentbuilder.fieldtype"
+			onchange="this.form.submit();"
+			published="0,1,2"
+		/>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.short_description ASC">COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_ASCENDING</option>
+			<option value="a.short_description DESC">COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_DESCENDING</option>
+			<option value="category_title ASC">COM_COMPONENTBUILDER_FILTER_FIELDTYPES_CATEGORIES_ASCENDING</option>
+			<option value="category_title DESC">COM_COMPONENTBUILDER_FILTER_FIELDTYPES_CATEGORIES_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_help_documents.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_HELP_DOCUMENTS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_HELP_DOCUMENTS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="helpdocumentsfiltertype"
+			name="type"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="helpdocumentsfilterlocation"
+			name="location"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewfolderlist"
+			name="admin_view"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="siteviewfolderlist"
+			name="site_view"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">COM_COMPONENTBUILDER_FILTER_TITLE_ASCENDING</option>
+			<option value="a.title DESC">COM_COMPONENTBUILDER_FILTER_TITLE_DESCENDING</option>
+			<option value="a.type ASC">COM_COMPONENTBUILDER_FILTER_TYPE_ASCENDING</option>
+			<option value="a.type DESC">COM_COMPONENTBUILDER_FILTER_TYPE_DESCENDING</option>
+			<option value="a.location ASC">COM_COMPONENTBUILDER_FILTER_LOCATION_ASCENDING</option>
+			<option value="a.location DESC">COM_COMPONENTBUILDER_FILTER_LOCATION_DESCENDING</option>
+			<option value="g. ASC">COM_COMPONENTBUILDER_FILTER_ADMIN_VIEW_ASCENDING</option>
+			<option value="g. DESC">COM_COMPONENTBUILDER_FILTER_ADMIN_VIEW_DESCENDING</option>
+			<option value="h. ASC">COM_COMPONENTBUILDER_FILTER_SITE_VIEW_ASCENDING</option>
+			<option value="h. DESC">COM_COMPONENTBUILDER_FILTER_SITE_VIEW_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_components.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_COMPONENTS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_COMPONENTS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="joomlacomponentsfiltercompanyname"
+			name="companyname"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="joomlacomponentsfilterauthor"
+			name="author"
+			label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.system_name ASC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING</option>
+			<option value="a.system_name DESC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING</option>
+			<option value="a.name_code ASC">COM_COMPONENTBUILDER_FILTER_NAME_CODE_ASCENDING</option>
+			<option value="a.name_code DESC">COM_COMPONENTBUILDER_FILTER_NAME_CODE_DESCENDING</option>
+			<option value="a.short_description ASC">COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_ASCENDING</option>
+			<option value="a.short_description DESC">COM_COMPONENTBUILDER_FILTER_SHORT_DESCRIPTION_DESCENDING</option>
+			<option value="a.companyname ASC">COM_COMPONENTBUILDER_FILTER_COMPANYNAME_ASCENDING</option>
+			<option value="a.companyname DESC">COM_COMPONENTBUILDER_FILTER_COMPANYNAME_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_modules.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_MODULES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_MODULES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="joomlamodulesfiltertarget"
+			name="target"
+			label="COM_COMPONENTBUILDER_JOOMLA_MODULE_TARGET_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.system_name ASC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING</option>
+			<option value="a.system_name DESC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING</option>
+			<option value="a.description ASC">COM_COMPONENTBUILDER_FILTER_DESCRIPTION_ASCENDING</option>
+			<option value="a.description DESC">COM_COMPONENTBUILDER_FILTER_DESCRIPTION_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_modules_files_folders_urls.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_MODULES_FILES_FOLDERS_URLS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_MODULES_FILES_FOLDERS_URLS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_modules_updates.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_MODULES_UPDATES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_MODULES_UPDATES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_plugin_groups.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGIN_GROUPS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGIN_GROUPS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classextends"
+			name="class_extends"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="g.name ASC">COM_COMPONENTBUILDER_FILTER_CLASS_EXTENDS_ASCENDING</option>
+			<option value="g.name DESC">COM_COMPONENTBUILDER_FILTER_CLASS_EXTENDS_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_plugins.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGINS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGINS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="classextends"
+			name="class_extends"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="joomlaplugingroups"
+			name="joomla_plugin_group"
+			label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_JOOMLA_PLUGIN_GROUP_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.system_name ASC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_ASCENDING</option>
+			<option value="a.system_name DESC">COM_COMPONENTBUILDER_FILTER_SYSTEM_NAME_DESCENDING</option>
+			<option value="g.name ASC">COM_COMPONENTBUILDER_FILTER_CLASS_EXTENDS_ASCENDING</option>
+			<option value="g.name DESC">COM_COMPONENTBUILDER_FILTER_CLASS_EXTENDS_DESCENDING</option>
+			<option value="h.name ASC">COM_COMPONENTBUILDER_FILTER_JOOMLA_PLUGIN_GROUP_ASCENDING</option>
+			<option value="h.name DESC">COM_COMPONENTBUILDER_FILTER_JOOMLA_PLUGIN_GROUP_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_plugins_files_folders_urls.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGINS_FILES_FOLDERS_URLS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGINS_FILES_FOLDERS_URLS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_joomla_plugins_updates.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_JOOMLA_PLUGINS_UPDATES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_JOOMLA_PLUGINS_UPDATES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_language_translations.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_LANGUAGE_TRANSLATIONS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_LANGUAGE_TRANSLATIONS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.source ASC">COM_COMPONENTBUILDER_FILTER_SOURCE_ASCENDING</option>
+			<option value="a.source DESC">COM_COMPONENTBUILDER_FILTER_SOURCE_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>

admin/models/forms/filter_languages.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_componentbuilder/models/rules"
+	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_COMPONENTBUILDER_FILTER_SEARCH"
+			description="COM_COMPONENTBUILDER_FILTER_SEARCH_LANGUAGES"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_COMPONENTBUILDER_FILTER_PUBLISHED"
+			description="COM_COMPONENTBUILDER_FILTER_PUBLISHED_LANGUAGES"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_COMPONENTBUILDER_FILTER_NAME_ASCENDING</option>
+			<option value="a.name DESC">COM_COMPONENTBUILDER_FILTER_NAME_DESCENDING</option>
+			<option value="a.langtag ASC">COM_COMPONENTBUILDER_FILTER_LANGTAG_ASCENDING</option>
+			<option value="a.langtag DESC">COM_COMPONENTBUILDER_FILTER_LANGTAG_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>