From ebcfc5363ece90c07b36eaef7be7576683fb008e Mon Sep 17 00:00:00 2001
From: aB0t <robot@vdm.io>
Date: Tue, 12 Mar 2024 16:01:04 +0200
Subject: [PATCH] Update on v3.2.0-beta6 (changes towards the next release)

Here's an update on the current version, which includes changes towards the next release still in development.
---
 README.md                                        |  2 +-
 admin/README.txt                                 |  2 +-
 admin/compiler/joomla_4/ADMIN_VIEW_HTML.php      |  1 +
 admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php |  1 +
 admin/models/fields/joomlaplugins.php            | 10 ++++++----
 admin/models/forms/admin_view.xml                |  2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 4a67d69ca..0c24e1e3d 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ TODO
 + *Version*: 3.2.0-beta6
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **738821**
++ *Line count*: **738831**
 + *Field count*: **2078**
 + *File count*: **5200**
 + *Folder count*: **459**
diff --git a/admin/README.txt b/admin/README.txt
index 4a67d69ca..0c24e1e3d 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -148,7 +148,7 @@ TODO
 + *Version*: 3.2.0-beta6
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **738821**
++ *Line count*: **738831**
 + *Field count*: **2078**
 + *File count*: **5200**
 + *Folder count*: **459**
diff --git a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
index d844a3e12..5e4b702cf 100644
--- a/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/ADMIN_VIEW_HTML.php
@@ -39,6 +39,7 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_###component###');
+		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
diff --git a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
index 9a5b4b279..0f3cac219 100644
--- a/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
+++ b/admin/compiler/joomla_4/SITE_ADMIN_VIEW_HTML.php
@@ -39,6 +39,7 @@ class HtmlView extends BaseHtmlView
 	{
 		// set params
 		$this->params = ComponentHelper::getParams('com_###component###');
+		$this->useCoreUI = true;
 		// Assign the variables
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
diff --git a/admin/models/fields/joomlaplugins.php b/admin/models/fields/joomlaplugins.php
index 379ca5e18..b9623e39b 100644
--- a/admin/models/fields/joomlaplugins.php
+++ b/admin/models/fields/joomlaplugins.php
@@ -144,9 +144,9 @@ class JFormFieldJoomlaplugins extends JFormFieldList
 	protected function getOptions()
 	{
 		// Get the user object.
-		$user = JFactory::getUser();
+		$user = Factory::getUser();
 		// Get the databse object.
-		$db = JFactory::getDBO();
+		$db = Factory::getDBO();
 		$query = $db->getQuery(true);
 		$query->select($db->quoteName(array('a.id','a.system_name','a.name','b.name','c.name'),array('id','plugin_system_name','name','class_extends_name','joomla_plugin_group_name')));
 		$query->from($db->quoteName('#__componentbuilder_joomla_plugin', 'a'));
@@ -169,11 +169,13 @@ class JFormFieldJoomlaplugins extends JFormFieldList
 		$options = array();
 		if ($items)
 		{
-			$options[] = JHtml::_('select.option', '', 'Select a plugin');
+			$options[] = Html::_('select.option', '', 'Select a plugin');
 			foreach($items as $item)
 			{
 				// set a full class name
-				$options[] = JHtml::_('select.option', $item->id, '( ' . $item->plugin_system_name . ' ) class Plg' . ucfirst($item->joomla_plugin_group_name) . $item->name . ' extends ' . $item->class_extends_name);
+				$group_name = $item->joomla_plugin_group_name ?? '';
+				$name = $item->name ?? '';
+				$options[] = Html::_('select.option', $item->id, '( ' . $item->plugin_system_name . ' ) class Plg' . $group_name . $name . ' extends ' . $item->class_extends_name);
 			}
 		}
 		return $options;
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 869804cdc..5d8cc8d58 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -455,7 +455,7 @@
 			name="source"
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE_LABEL"
 			class="btn-group btn-group-yesno"
-			default=""
+			default="0"
 			required="true">
 			<!-- Option Set. -->
 			<option value="1">