Added shortcut buttons to the admin views list view to quickly access admin fields. Imporved the upgrade script to insure beter conversion of fields from repeatable to subform fields.

README.md

@@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.5.8
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **124593**
++ *Line count*: **124646**
 + *File count*: **742**
 + *Folder count*: **129**
 

admin/README.txt

@@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.5.8
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **124593**
++ *Line count*: **124646**
 + *File count*: **742**
 + *Folder count*: **129**
 

admin/assets/css/admin_view.css

@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/assets/css/admin_views.css

@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/controllers/admin_view.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/controllers/admin_views.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/controllers/ajax.json.php

@@ -384,9 +384,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$typeValue = $jinput->get('type', NULL, 'WORD');
-						if($typeValue && $user->id != 0)
+						$sizeValue = $jinput->get('size', NULL, 'INT');
+						if($typeValue && $sizeValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getButtonID($typeValue);
+							$result = $this->getModel('ajax')->getButtonID($typeValue, $sizeValue);
 						}
 						else
 						{

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

@@ -579,13 +579,15 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="<p>The scripts
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="<p>Please do not change this area unless you would like to add special import to this view that goes beyond the default import concept that Component Builder already does automatic if this view is set to have import & export in the component area where this view is linked to the component.</p>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL="Beginners notice."
-COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="<div id='jform_create_edit_buttons'></div>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="Some Shortcut Buttons<hr /><div id='jform_create_edit_buttons'></div>"
-COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="<hr /><h4>Linked Fields</h4><div id='display_admin_fields'>Display of the fields will load here!</div><hr /><h4>Field Conditions</h4><div id='display_admin_fields_conditions'>Display of the fields conditions will load here!</div>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="<hr /><h4>Linked Fields <span id='header_admin_fields_buttons'></span></h4><div id='display_admin_fields'>Display of the fields will load here!</div><hr /><h4>Field Conditions <span id='header_admin_fields_conditions_buttons'></span></h4><div id='display_admin_fields_conditions'>Display of the fields conditions will load here!</div>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="Here we can add some description to explain how things now work."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields &amp; Conditions"
-COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions."
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=22m20s' target='_blank'>tutorial</a> for more info. "
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL="Linked Views Options"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=6m19s' target='_blank'>tutorial</a> for more info."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL="Permission Implementation"
-COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION="If no tabs has been set all fields will be displayed together in one tab."
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION="If no tabs has been set all fields will be displayed together in one tab. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=19m25s' target='_blank'>tutorial</a> for more info."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL="Tab Setup Options"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle"
@@ -876,7 +878,7 @@ COM_COMPONENTBUILDER_BSB_EMCOMPONENT_DETAILSEM="<b>%s</b> <em>component details<
 COM_COMPONENTBUILDER_BSB_HAS_ID_MISMATCH_OF_SELECTED_BFIELDB_SO_THE_IDS_WAS_REMOVED="<b>%s</b> has id mismatch of selected <b>field</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BSITE_VIEW_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BSITE_VIEWB_SO_THE_IDS_WAS_REMOVED="<b>Site view in %s</b> has id mismatch of selected <b>site view</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BSNIPPETB_IDS_MISMATCH_IN_BSB="<b>Snippet</b> id:%s mismatch in <b>%s</b>."
-COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED="Button to create %s will show once %s is saved."
+COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME="Button to create %s will show once %s is saved for the first time."
 COM_COMPONENTBUILDER_BVIEW_TABLE_MAINB_IDS_MISMATCH_IN_BSB="<b>View table main</b> id:%s mismatch in <b>%s</b>."
 COM_COMPONENTBUILDER_CHAIN="Chain"
 COM_COMPONENTBUILDER_CHECK_YOUR_OWNER_DETAILS_IT_HAS_NOT_BEEN_SET_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="Check your owner details, it has not been set. Open the JCB Global Options, go to the Company tab and add the correct company details there."
@@ -1169,6 +1171,7 @@ COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors"
 COM_COMPONENTBUILDER_COPYRIGHT="Copyright"
 COM_COMPONENTBUILDER_COPYRIGHT_S="Copyright: %s"
+COM_COMPONENTBUILDER_CREATE="Create"
 COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
 COM_COMPONENTBUILDER_CREATE_S_FOR_THIS_S="Create %s for this %s"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View"
@@ -2118,6 +2121,8 @@ COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
 COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_S_FOR_THIS_S="Edit %s for this %s"
+COM_COMPONENTBUILDER_EDIT_THE_ADMIN_FIELDS="Edit the admin fields"
+COM_COMPONENTBUILDER_EDIT_THE_ADMIN_FIELDS_CONDITIONS="Edit the admin fields conditions"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
 COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EMAIL="Email"
@@ -4441,6 +4446,8 @@ COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EI
 COM_COMPONENTBUILDER_YOUR_DATA_IS_ENCRYPTED_WITH_A_AES_ONE_HUNDRED_AND_TWENTY_EIGHT_BIT_ENCRYPTION_USING_THE_ABOVE_THIRTY_TWO_CHARACTER_KEY_WITHOUT_THIS_KEY_IT_WILL_TAKE_THE_CURRENT_TECHNOLOGY_WITH_A_BRUTE_FORCE_ATTACK_METHOD_MORE_THEN_A_HREFHTTPRANDOMIZECOMHOWLONGTOHACKPASS_TARGET_BLANK_TITLEHOW_LONG_TO_HACK_PASSSEVEN_HUNDRED_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZERO_ZEROA_YEARS_TO_CRACK_THEORETICALLY_UNLESS_THEY_HAVE_THIS_KEY_ABOVE_SO_DO_KEEP_IT_SAFE="Your data is encrypted with a AES 128 bit encryption using the above 32 character key. Without this key it will take the current technology with a brute force attack method more then <a href="http://random-ize.com/how-long-to-hack-pass/" target="_blank" title="How long to hack pass">700 000 000 000 000 000 000 000 000 000 000</a> years to crack theoretically. Unless they have this key above, so do keep it safe."
 COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LIKE_TO_IMPORTBR_SMALLPLEASE_NOTE_THAT_SMART_COMPONENT_IMPORT_ONLY_WORKS_WITH_THE_FOLLOWING_FORMAT_BZIPBSMALL="You can now select the component <b>zip</b> package you would like to import.<br /><small>Please note that smart component import only works with the following format: <b>(.zip)</b></small>"
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to import a component, please contact your system administrator for more help."
+COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then 50 %s is considered bad practice."
+COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then 50 %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s."
 COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT="You must select a component!"
 COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS="You should add the correct owner details."
 COM_COMPONENTBUILDER_YOU_SHOULD_ONLY_CONTINUE_THIS_IMPORT_IF_YOU_HAVE_BACKUP_YOUR_COMPONENTS_AND_INSURED_THAT_THE_PACKAGE_OWNER_IS_REPUTABLE="You should only continue this import if you have backup your components, and insured that the package owner is reputable."

admin/layouts/admin_view/settings_fullwidth.php

@@ -34,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 	'addpermissions',
 	'note_on_tabs',
 	'addtabs',
+	'note_on_linked_views',
 	'addlinked_views'
 );
 

admin/models/admin_view.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
@@ -250,10 +250,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_display = base64_decode($item->php_import_display);
 			}
 
-			if (!empty($item->css_view))
+			if (!empty($item->php_getitem))
 			{
-				// base64 Decode css_view.
+				// base64 Decode php_getitem.
-				$item->css_view = base64_decode($item->css_view);
+				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
 			if (!empty($item->php_import_save))
@@ -262,6 +262,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
+			if (!empty($item->css_view))
+			{
+				// base64 Decode css_view.
+				$item->css_view = base64_decode($item->css_view);
+			}
+
 			if (!empty($item->css_views))
 			{
 				// base64 Decode css_views.
@@ -334,12 +340,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_setdata = base64_decode($item->php_import_setdata);
 			}
 
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
-			}
-
 			if (!empty($item->php_import_ext))
 			{
 				// base64 Decode php_import_ext.
@@ -465,6 +465,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			{
 				$this->_db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id');
 			}
+			// also update the fields and conditions
 			
 			if (!empty($item->id))
 			{
@@ -1445,10 +1446,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}
 
-		// Set the css_view string to base64 string.
+		// Set the php_getitem string to base64 string.
-		if (isset($data['css_view']))
+		if (isset($data['php_getitem']))
 		{
-			$data['css_view'] = base64_encode($data['css_view']);
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
 		// Set the php_import_save string to base64 string.
@@ -1457,6 +1458,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
+		// Set the css_view string to base64 string.
+		if (isset($data['css_view']))
+		{
+			$data['css_view'] = base64_encode($data['css_view']);
+		}
+
 		// Set the css_views string to base64 string.
 		if (isset($data['css_views']))
 		{
@@ -1529,12 +1536,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
 		}
 
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
-		}
-
 		// Set the php_import_ext string to base64 string.
 		if (isset($data['php_import_ext']))
 		{

admin/models/admin_views.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
@@ -275,10 +275,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->sql = base64_decode($item->sql);
 						// decode php_import_display
 						$item->php_import_display = base64_decode($item->php_import_display);
-						// decode css_view
+						// decode php_getitem
-						$item->css_view = base64_decode($item->css_view);
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
+						// decode css_view
+						$item->css_view = base64_decode($item->css_view);
 						// decode css_views
 						$item->css_views = base64_decode($item->css_views);
 						// decode javascript_view_file
@@ -303,8 +305,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// unset the values we don't want exported.

admin/models/ajax.php

@@ -252,7 +252,7 @@ class ComponentbuilderModelAjax extends JModelList
 		return false;
 	}			
 			
-	public function getButtonID($type)
+	public function getButtonID($type, $size)
 	{
 		if (isset($this->buttonArray[$type]))
 		{
@@ -272,31 +272,50 @@ class ComponentbuilderModelAjax extends JModelList
 					if ($id = ComponentbuilderHelper::getVar($type, $values['a_id'], $values['a_view'], 'id'))
 					{
 						$buttonText = JText::sprintf('COM_COMPONENTBUILDER_EDIT_S_FOR_THIS_S', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w'));
+						$buttonTextSmall = JText::_('COM_COMPONENTBUILDER_EDIT');
 						$editThis = 'index.php?option=com_componentbuilder&view='.$this->buttonArray[$type].'&task='.$type.'.edit&id='.$id;
 						$icon = 'icon-apply';
 					}
 					else
 					{
 						$buttonText = JText::sprintf('COM_COMPONENTBUILDER_CREATE_S_FOR_THIS_S', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w'));
+						$buttonTextSmall = JText::_('COM_COMPONENTBUILDER_CREATE');
 						$editThis = 'index.php?option=com_componentbuilder&view='.$type.'&layout=edit';
 						$icon = 'icon-new';
 					}
 					// build the button
-					$button = '<div class="control-group">
+					$button = array();
-						<div class="control-label">
+					if (1 == $size)
-							<label>' . ComponentbuilderHelper::safeString($type, 'Ww') . '</label>
+					{
-						</div>
+						$button[] = '<div class="control-group">';
-						<div class="controls">	
+						$button[] = '<div class="control-label">';
-								<a class="btn btn-success vdm-button-new" onclick="UIkit.modal.confirm(\''.JText::_('COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE').'\', function(){ window.location.href = \''.$editThis.$ref.'\' })" href="javascript:void(0)" >
+						$button[] = '<label>' . ComponentbuilderHelper::safeString($type, 'Ww') . '</label>';
-									<span class="'.$icon.' icon-white"></span> 
+						$button[] = '</div>';
-									' . $buttonText . '
+						$button[] = '<div class="controls">';
-								</a>
+					}
-						</div>
+					$button[] = '<a class="btn btn-success vdm-button-new" onclick="UIkit.modal.confirm(\''.JText::_('COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE').'\', function(){ window.location.href = \''.$editThis.$ref.'\' })" href="javascript:void(0)" >';
-					</div>';
+					if (1 == $size)
-					// return the button attached to input field
+					{
-					return $button;
+						$button[] = '<span class="'.$icon.' icon-white"></span>';
+						$button[] = $buttonText;
+						$button[] = '</a>';
+						$button[] = '</div>';
+						$button[] = '</div>';
+					}
+					elseif (2 == $size)
+					{
+						$button[] = '<span class="'.$icon.' icon-white"></span>';
+						$button[] = $buttonTextSmall;
+						$button[] = '</a>';
+					}
+					// return the button attached to input field
+					return implode("\n", $button);
+				}
+				// only return notice if big button
+				if (1 == $size)
+				{
+					return '<div class="control-group"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '</div></div>';
 				}
-				return '<div class="control-group"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '</div></div>';
 			}
 		}
 		return '';
@@ -366,6 +385,8 @@ class ComponentbuilderModelAjax extends JModelList
 				// build table
 				if (ComponentbuilderHelper::checkArray($rows) && ComponentbuilderHelper::checkArray($head))
 				{
+					// set the number of rows
+					$this->rowNumber = count($rows);
 					// return the table
 					return $this->setSubformTable($head, $rows);
 				}
@@ -436,6 +457,8 @@ class ComponentbuilderModelAjax extends JModelList
 	{
 		if (isset($this->fieldsArray[$type]))
 		{
+			// set type name
+			$typeName = ComponentbuilderHelper::safeString($type, 'w');
 			// get the view name & id
 			$values = $this->getViewID();
 			// check if we are in the correct view.
@@ -444,11 +467,23 @@ class ComponentbuilderModelAjax extends JModelList
 				// get the field data
 				if ($fieldsData = ComponentbuilderHelper::getVar($type, (int) $values['a_id'], 'admin_view', $this->fieldsArray[$type]))
 				{
-					// decode the fields
+					// get the table
-					return $this->getSubformTable($type, $fieldsData);
+					$table = $this->getSubformTable($type, $fieldsData);
+					// set notice of bad practice
+					$notice = '';
+					if (isset($this->rowNumber) && $this->rowNumber > 50)
+					{
+						$notice = '<div class="alert alert-warning">' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S', $this->rowNumber, $typeName, $typeName, $typeName, $typeName) . '</div>';
+					}
+					elseif (isset($this->rowNumber))
+					{
+						$notice = '<div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE', $this->rowNumber, $typeName, $typeName) . '</div>';
+					}
+					// return table
+					return $notice.$table;
 				}
 			}
-			return '<div class="control-group"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE', ComponentbuilderHelper::safeString($type, 'w')) . '</div></div>';
+			return '<div class="control-group"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE', $typeName) . '</div></div>';
 		}
 		return '<div class="control-group"><div class="alert alert-error"><h4>' . JText::_('COM_COMPONENTBUILDER_TYPE_ERROR') . '</h4><p>' . JText::_('COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST') . '</p></div></div>';
 	}

admin/models/forms/admin_view.js

@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
@@ -1179,14 +1179,14 @@ function isSet(val)
 jQuery(document).ready(function()
 {
 	// set button
-	addButtonID('admin_fields','create_edit_buttons'); // <-- first
+	addButtonID('admin_fields','create_edit_buttons', 1); // <-- first
 	var valueSwitch = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
 	getImportScripts(valueSwitch);
-	addButtonID('admin_fields_conditions','create_edit_buttons'); // <-- second
-
 	// now load the fields
 	getFieldsDisplay('admin_fields');
 	getFieldsDisplay('admin_fields_conditions');
+	// set button
+	addButtonID('admin_fields_conditions','create_edit_buttons', 1); // <-- second
 });
 
 function getFieldsDisplay(type){
@@ -1194,6 +1194,8 @@ function getFieldsDisplay(type){
 		if(result){
 			jQuery('#display_'+type).html(result);
 		}
+		// set button
+		addButtonID(type,'header_'+type+'_buttons', 2); // <-- little edit button
 	});
 }
 
@@ -1215,10 +1217,10 @@ function addData(result,where){
 	jQuery(where).closest('.control-group').parent().append(result);
 }
 			
-function addButtonID_server(type){
+function addButtonID_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod);
-	if(token.length > 0 && type.length > 0){
+	if(token.length > 0 && type.length > 0 && size > 0){
-		var request = 'token='+token+'&type='+type;
+		var request = 'token='+token+'&type='+type+'&size='+size;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -1228,10 +1230,14 @@ function addButtonID_server(type){
 		jsonp: 'callback'
 	});
 }
-function addButtonID(type,where){
+function addButtonID(type, where, size){
-	addButtonID_server(type).done(function(result) {
+	addButtonID_server(type, size).done(function(result) {
 		if(result){
+			if (1 == size) {
 				addData(result, '#jform_'+where);
+			} else if (2 == size) {
+				jQuery('#'+where).html(result);
+			}
 		}
 	});
 }			

admin/models/forms/admin_view.xml

@@ -489,6 +489,21 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT"
 			required="true"
 		/>
+		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" close="true" />
+		<!-- Php_before_publish Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_before_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT"
+			required="true"
+		/>
 		<!-- Addlinked_views Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -568,21 +583,6 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_before_publish Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT"
-			required="true"
-		/>
-		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-success note_create_edit_notice" />
 		<!-- Php_before_delete Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -596,8 +596,8 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT"
 			required="true"
 		/>
-		<!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_create_edit_buttons" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION" class="note_create_edit_buttons" />
+		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-success note_create_edit_notice" />
 		<!-- Php_document Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -611,8 +611,8 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT"
 			required="true"
 		/>
-		<!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_create_edit_display" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION" class="note_create_edit_display" />
+		<field type="note" name="note_create_edit_buttons" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION" class="note_create_edit_buttons" />
 		<!-- Sql Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -626,6 +626,47 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
 			required="true"
 		/>
+		<!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_create_edit_display" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION" class="note_create_edit_display" />
+		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_display"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
+			required="true"
+		/>
+		<!-- Php_getitem Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_getitem"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT"
+			required="true"
+		/>
+		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
+			required="true"
+		/>
 		<!-- Add_css_view Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -640,19 +681,6 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_display"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
-			required="true"
-		/>
 		<!-- Css_view Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
@@ -666,19 +694,20 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT"
 			required="true"
 		/>
-		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
+		<!-- Add_php_getitems Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
+			type="radio"
-			name="php_import_save"
+			name="add_php_getitems"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL"
-			rows="30"
+			class="btn-group btn-group-yesno"
-			cols="15"
+			default="0"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
+			required="true">
-			class="text_area span12"
+			<!-- Option Set. -->
-			filter="raw"
+			<option value="1">
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			required="true"
+			<option value="0">
-		/>
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Add_css_views Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -693,11 +722,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_getitems Field. Type: Radio. (joomla) -->
+		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_getitems"
+			name="add_php_getitems_after_all"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -720,11 +749,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_HINT"
 			required="true"
 		/>
-		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
+		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_getitems_after_all"
+			name="add_php_getlistquery"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -748,11 +777,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_getlistquery"
+			name="add_php_before_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -775,11 +804,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_HINT"
 			required="true"
 		/>
-		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
+		<!-- Add_php_save Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_save"
+			name="add_php_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -803,11 +832,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_save Field. Type: Radio. (joomla) -->
+		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_save"
+			name="add_php_postsavehook"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -830,11 +859,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT"
 			required="true"
 		/>
-		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
+		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_postsavehook"
+			name="add_php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -858,11 +887,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
+		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_allowedit"
+			name="add_php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -885,11 +914,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_HINT"
 			required="true"
 		/>
-		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
+		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_batchcopy"
+			name="add_php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -913,11 +942,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_batchmove"
+			name="add_php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -940,11 +969,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_HINT"
 			required="true"
 		/>
-		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
+		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_publish"
+			name="add_php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -968,11 +997,11 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_publish"
+			name="add_php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1491,11 +1520,11 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_delete"
+			name="add_php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1518,11 +1547,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT"
 			required="false"
 		/>
-		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_delete"
+			name="add_php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1545,11 +1574,11 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_HINT"
 			required="false"
 		/>
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_document"
+			name="add_sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -1572,33 +1601,6 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_HINT"
 			required="false"
 		/>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Php_model_list Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_model_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_HINT"
-			required="false"
-		/>
 		<!-- Addtables Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1635,6 +1637,21 @@
 				/>
 			</form>
 		</field>
+		<!-- Php_model_list Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_model_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_HINT"
+			required="false"
+		/>
+		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1649,21 +1666,6 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
-		<!-- Php_ajaxmethod Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_ajaxmethod"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_HINT"
-			required="true"
-		/>
 		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1679,6 +1681,32 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
+		<!-- Php_ajaxmethod Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_ajaxmethod"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_HINT"
+			required="true"
+		/>
+		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="html_import_view"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+			required="true"
+		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1811,17 +1839,17 @@
 				/>
 			</form>
 		</field>
-		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="html_import_view"
+			name="php_import_setdata"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
 			required="true"
 		/>
 		<!-- Add_php_getitem Field. Type: Radio. (joomla) -->
@@ -1838,32 +1866,6 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_setdata"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
-			required="true"
-		/>
-		<!-- Php_getitem Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_getitem"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT"
-			required="true"
-		/>
 		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"

admin/sql/install.mysql.utf8.sql

@@ -236,23 +236,23 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_source` (`source`),
 	KEY `idx_add_fadein` (`add_fadein`),
 	KEY `idx_add_css_view` (`add_css_view`),
-	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
 	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
 	KEY `idx_add_php_before_save` (`add_php_before_save`),
-	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
 	KEY `idx_add_php_save` (`add_php_save`),
+	KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`),
 	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
-	KEY `idx_add_javascript_views_file` (`add_javascript_views_file`),
 	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
+	KEY `idx_add_javascript_views_file` (`add_javascript_views_file`),
 	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
 	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`),
 	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
 	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_add_php_document` (`add_php_document`),

admin/tables/admin_view.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_view/submitbutton.js

@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_view/tmpl/edit.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_view/view.html.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/tmpl/default.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/tmpl/default_batch_body.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/tmpl/default_batch_footer.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/tmpl/default_body.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
@@ -85,6 +85,16 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 			<?php else: ?>
 				<div class="name"><?php echo $this->escape($item->system_name); ?></div>
 			<?php endif; ?>
+			
+			<div class="btn-group" style="margin: 5px 0 0 0;">
+				<?php if ($canDo->get('admin_view.edit') && $admin_field_id = ComponentbuilderHelper::getVar('admin_fields', $item->id, 'admin_view', 'id')): ?>
+					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=admins_fields&task=admin_fields.edit&id=<?php echo $admin_field_id; ?>&ref=admin_views" title="<?php echo JText::_('COM_COMPONENTBUILDER_EDIT_THE_ADMIN_FIELDS'); ?>" ><span class="icon-list"></span></a>
+				<?php endif; ?>
+				<?php if ($canDo->get('admin_view.edit') && $admin_condition_id = ComponentbuilderHelper::getVar('admin_fields_conditions', $item->id, 'admin_view', 'id')): ?>
+					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=admins_fields_conditions&task=admin_fields_conditions.edit&id=<?php echo $admin_condition_id; ?>&ref=admin_views" title="<?php echo JText::_('COM_COMPONENTBUILDER_EDIT_THE_ADMIN_FIELDS_CONDITIONS'); ?>" ><span class="icon-shuffle"></span></a>
+				<?php endif; ?>
+			</div>
+			
 		</td>
 		<td class="hidden-phone">
 			<?php echo $this->escape($item->name_single); ?>

admin/views/admin_views/tmpl/default_foot.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/tmpl/default_head.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/tmpl/default_toolbar.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

admin/views/admin_views/view.html.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 166 of this MVC
+	@version		@update number 178 of this MVC
 	@build			14th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder

script.php

@@ -1929,9 +1929,9 @@ class com_componentbuilderInstallerScript
 			if (count($version) == 3 && $version[0] <= 2 && $version[1] <= 5 && (($version[1] == 5 && $version[2] <= 4) || ($version[1] < 5)))
 			{
 				// do some conversions in the translations table
-				$convertRepeatable($db, 'language_translation', array('id', 'translation'), array('translation' => array('check' => array('translation','language'), 'key' => 'translation')));
+				$convertRepeatable($db, 'language_translation', array('id', 'translation'), array('translation' => array('check' => array('translation'), 'key' => 'translation')));
 				// do some conversions in the fieldtype table
-				$convertRepeatable($db, 'fieldtype', array('id', 'properties'), array('properties' => array('check' => array('name','mandatory'), 'key' => 'properties')));
+				$convertRepeatable($db, 'fieldtype', array('id', 'properties'), array('properties' => array('check' => array('name'), 'key' => 'properties')));
 			}
 			// target version less then 2.5.6
 			if (count($version) == 3 && $version[0] <= 2 && $version[1] <= 5 && (($version[1] == 5 && $version[2] <= 5) || ($version[1] < 5)))
@@ -1939,12 +1939,12 @@ class com_componentbuilderInstallerScript
 				// do some conversions in the dynamic get table
 				$convertRepeatable($db, 'dynamic_get', array('id', 'join_view_table', 'join_db_table', 'filter', 'where', 'order', 'global'),
 					array(
-						'join_view_table' => array('check' => array('view_table','row_type','as','type'), 'key' => 'join_view_table'),
+						'join_view_table' => array('check' => array('view_table'), 'key' => 'join_view_table'),
-						'join_db_table' => array('check' => array('db_table','row_type','as','type'), 'key' => 'join_db_table'),
+						'join_db_table' => array('check' => array('db_table'), 'key' => 'join_db_table'),
-						'filter' => array('check' => array('filter_type', 'state_key', 'operator'), 'key' => 'filter'),
+						'filter' => array('check' => array('filter_type'), 'key' => 'filter'),
-						'where' => array('check' => array('table_key', 'operator', 'value_key'), 'key' => 'where'),
+						'where' => array('check' => array('table_key'), 'key' => 'where'),
-						'order' => array('check' => array('table_key', 'direction'), 'key' => 'order'),
+						'order' => array('check' => array('table_key'), 'key' => 'order'),
-						'global' => array('check' => array('name', 'key', 'as', 'type'), 'key' => 'global')
+						'global' => array('check' => array('name'), 'key' => 'global')
 					)
 				);
 			}
@@ -1954,29 +1954,29 @@ class com_componentbuilderInstallerScript
 				// do some conversions in the admin_view table
 				$convertRepeatable($db, 'admin_view', array('id', 'ajax_input', 'custom_button', 'addtables', 'addlinked_views', 'addconditions', 'addfields', 'addtabs', 'addpermissions'),
 					array(
-						'ajax_input' => array('check' => array('value_name','task_name','input_default','input_filter','method_name', 'user_check'), 'key' => 'ajax_input'),
+						'ajax_input' => array('check' => array('value_name'), 'key' => 'ajax_input'),
-						'custom_button' => array('check' => array('icomoon', 'name', 'method', 'target', 'type'), 'key' => 'custom_button'),
+						'custom_button' => array('check' => array('name'), 'key' => 'custom_button'),
-						'addtables' =>  array('check' => array('dbtables', 'sourcemap'), 'key' => 'addtables'),
+						'addtables' =>  array('check' => array('table'), 'key' => 'addtables'),
-						'addlinked_views' =>  array('check' => array('adminview', 'tab', 'key', 'parentkey', 'addnew'), 'key' => 'addlinked_views'),
+						'addlinked_views' =>  array('check' => array('adminview'), 'key' => 'addlinked_views'),
-						'addconditions' =>  array('check' => array('target_field', 'target_behavior', 'target_relation', 'match_field', 'match_behavior', 'match_options'), 'key' => 'addconditions'),
+						'addconditions' =>  array('check' => array('target_field'), 'key' => 'addconditions'),
-						'addfields' =>  array('check' => array('field', 'list', 'order_list', 'title', 'alias', 'sort', 'search', 'filter', 'link', 'tab', 'alignment', 'order_edit', 'permission'), 'key' => 'addfields'),
+						'addfields' =>  array('check' => array('field'), 'key' => 'addfields'),
 						'addtabs' =>  array('check' => array('name'), 'key' => 'addtabs'),
-						'addpermissions' =>  array('check' => array('action', 'implementation'), 'key' => 'addpermissions')
+						'addpermissions' =>  array('check' => array('action'), 'key' => 'addpermissions')
 					)
 				);
 
 				// do some conversions in the site_view table
 				$convertRepeatable($db, 'site_view', array('id', 'ajax_input', 'custom_button'),
 					array(
-						'ajax_input' => array('check' => array('value_name','task_name','input_default','input_filter','method_name', 'user_check'), 'key' => 'ajax_input'),
+						'ajax_input' => array('check' => array('value_name'), 'key' => 'ajax_input'),
-						'custom_button' => array('check' => array('icomoon', 'name', 'method', 'target', 'type'), 'key' => 'custom_button')
+						'custom_button' => array('check' => array('name'), 'key' => 'custom_button')
 					)
 				);
 
 				// do some conversions in the custom_admin_view table
 				$convertRepeatable($db, 'custom_admin_view', array('id', 'custom_button'),
 					array(
-						'custom_button' => array('check' => array('icomoon', 'name', 'method', 'target', 'type'), 'key' => 'custom_button')
+						'custom_button' => array('check' => array('name'), 'key' => 'custom_button')
 					)
 				);
 			}
@@ -2045,9 +2045,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -2316,9 +2316,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import_save":"php_import_save","add_css_view":"add_css_view","css_view":"css_view","add_php_getitems":"add_php_getitems","add_css_views":"add_css_views","add_php_getitems_after_all":"add_php_getitems_after_all","css_views":"css_views","add_php_getlistquery":"add_php_getlistquery","add_javascript_view_file":"add_javascript_view_file","add_php_before_save":"add_php_before_save","javascript_view_file":"javascript_view_file","add_php_save":"add_php_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","javascript_view_footer":"javascript_view_footer","add_php_allowedit":"add_php_allowedit","add_javascript_views_file":"add_javascript_views_file","add_php_batchcopy":"add_php_batchcopy","javascript_views_file":"javascript_views_file","add_php_batchmove":"add_php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","add_php_before_publish":"add_php_before_publish","javascript_views_footer":"javascript_views_footer","add_php_after_publish":"add_php_after_publish","add_custom_button":"add_custom_button","add_php_before_delete":"add_php_before_delete","add_php_after_delete":"add_php_after_delete","php_controller":"php_controller","add_php_document":"add_php_document","php_model":"php_model","add_sql":"add_sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","add_custom_import":"add_custom_import","php_ajaxmethod":"php_ajaxmethod","html_import_view":"html_import_view","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_php_getitems","add_css_views","add_php_getitems_after_all","add_php_getlistquery","add_javascript_view_file","add_php_before_save","add_php_save","add_javascript_view_footer","add_php_postsavehook","add_php_allowedit","add_javascript_views_file","add_php_batchcopy","add_php_batchmove","add_javascript_views_footer","add_php_before_publish","add_php_after_publish","add_custom_button","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;