Fixed gh-420 to allow the linked site view to save correctly.

README.md

@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 9th June, 2019
++ *Last Build*: 11th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206638**
++ *Line count*: **206602**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**

admin/README.txt

@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 9th June, 2019
++ *Last Build*: 11th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206638**
++ *Line count*: **206602**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**

admin/models/fields/adminsviews.php

@@ -35,22 +35,23 @@ class JFormFieldAdminsviews extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
+		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
+		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminviews_system_name')));
+		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminviews_system_name')));
-		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.system_name ASC');
+		$query->order('a.system_name ASC');
-		$db->setQuery((string)$query);
+		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
+		$items = $db->loadObjectList();
-		$options = array();
+		$options = array();
-		if ($items)
+		if ($items)
-		{
+		{
-			foreach($items as $item)
+			foreach($items as $item)
-			{
+			{
-				$options[] = JHtml::_('select.option', $item->id, $item->adminviews_system_name);
+				$options[] = JHtml::_('select.option', $item->id, $item->adminviews_system_name);
-			}
+			}
-		}
+		}
+
 		return $options;
 	}
 }

admin/models/forms/component_admin_views.xml

@@ -560,7 +560,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -571,7 +570,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -582,7 +580,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -593,7 +590,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -604,7 +600,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CHECKIN_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CHECKIN_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -615,7 +610,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_HISTORY_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_HISTORY_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -626,7 +620,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_FIELDS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_FIELDS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -637,7 +630,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -648,7 +640,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -659,7 +650,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_DESCRIPTION"
 					class="inputbox"
 				/>

admin/models/forms/component_custom_admin_menus.xml

@@ -172,7 +172,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -183,7 +182,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -194,7 +192,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -206,8 +203,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					default=""
-					required="true"
 					button="false"
 				/>
 			</form>

admin/models/forms/component_custom_admin_views.xml

@@ -558,7 +558,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -569,7 +568,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -580,7 +578,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -591,7 +588,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -602,7 +598,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -614,8 +609,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADMINVIEWS_DESCRIPTION"
 					class="fieldMedium"
 					multiple="true"
-					default=""
-					required="true"
 					button="false"
 				/>
 				<!-- Before Field. Type: Componentadminmenus. (custom) -->
@@ -626,8 +619,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_BEFORE_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					default=""
-					required="true"
 					button="false"
 				/>
 			</form>

admin/models/forms/component_files_folders.xml

@@ -149,7 +149,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -205,7 +204,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -259,7 +257,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -312,7 +309,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>

admin/models/forms/component_site_views.xml

@@ -128,7 +128,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -139,7 +138,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -150,7 +148,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -161,7 +158,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -172,7 +168,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>

admin/models/forms/library_files_folders_urls.xml

@@ -148,7 +148,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -204,7 +203,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -258,7 +256,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -311,7 +308,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>

componentbuilder.xml

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