From cec566176d89e5e7fee36fbcc637b44a5921264a Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 27 Apr 2018 15:45:50 +0200
Subject: [PATCH] Fixed admin_fields_conditions edit view to insure an array
 gets given to the count function

---
 README.md                                         | 4 ++--
 admin/README.txt                                  | 4 ++--
 admin/helpers/compiler/a_Get.php                  | 2 +-
 admin/models/forms/admin_fields.xml               | 3 ++-
 admin/models/forms/admin_view.xml                 | 4 +++-
 admin/models/forms/component_admin_views.xml      | 3 ++-
 admin/models/forms/custom_admin_view.xml          | 4 +++-
 admin/models/forms/site_view.xml                  | 4 +++-
 admin/views/admin_fields_conditions/tmpl/edit.php | 2 +-
 componentbuilder.xml                              | 2 +-
 10 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 660f9cddf..77adf52c6 100644
--- a/README.md
+++ b/README.md
@@ -126,11 +126,11 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 26th April, 2018
++ *Last Build*: 27th April, 2018
 + *Version*: 2.7.6
 + *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*: **193266**
++ *Line count*: **193274**
 + *Field count*: **1027**
 + *File count*: **1201**
 + *Folder count*: **193**
diff --git a/admin/README.txt b/admin/README.txt
index 660f9cddf..77adf52c6 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -126,11 +126,11 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 26th April, 2018
++ *Last Build*: 27th April, 2018
 + *Version*: 2.7.6
 + *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*: **193266**
++ *Line count*: **193274**
 + *Field count*: **1027**
 + *File count*: **1201**
 + *Folder count*: **193**
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index add968cbf..8b08bdfa6 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -2116,7 +2116,7 @@ class Get
 			// Create a new query object.
 			$query = $this->db->getQuery(true);
 
-			// Order it by the ordering field.
+			// Select all the values in the field
 			$query->select('a.*');
 			$query->select($this->db->quoteName(array('c.name', 'c.properties'), array('type_name', 'properties')));
 			$query->from('#__componentbuilder_field AS a');
diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml
index 244c5cad5..04fd703af 100644
--- a/admin/models/forms/admin_fields.xml
+++ b/admin/models/forms/admin_fields.xml
@@ -105,7 +105,8 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
-			icon="list">
+			icon="list"
+			min="1">
 			<form hidden="true" name="list_addfields_modal" repeat="true">
 				<!-- Field Field. Type: Fields. (custom) -->
 				<field
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index f5d2d5ce2..dfc764bad 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -1140,7 +1140,9 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list">
+			icon="list"
+			max="20"
+			min="1">
 			<form hidden="true" name="list_custom_button_modal" repeat="true">
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/models/forms/component_admin_views.xml b/admin/models/forms/component_admin_views.xml
index 86b2dd2f7..c3ed3fece 100644
--- a/admin/models/forms/component_admin_views.xml
+++ b/admin/models/forms/component_admin_views.xml
@@ -105,7 +105,8 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_DESCRIPTION"
-			icon="list">
+			icon="list"
+			min="1">
 			<form hidden="true" name="list_addadmin_views_modal" repeat="true">
 				<!-- Adminview Field. Type: Adminviews. (custom) -->
 				<field
diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml
index fc93896fe..f6e53615a 100644
--- a/admin/models/forms/custom_admin_view.xml
+++ b/admin/models/forms/custom_admin_view.xml
@@ -611,7 +611,9 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list">
+			icon="list"
+			max="20"
+			min="1">
 			<form hidden="true" name="list_custom_button_modal" repeat="true">
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml
index 96845bf73..fc1e9e9a2 100644
--- a/admin/models/forms/site_view.xml
+++ b/admin/models/forms/site_view.xml
@@ -630,7 +630,9 @@
 			label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list">
+			icon="list"
+			max="20"
+			min="1">
 			<form hidden="true" name="list_custom_button_modal" repeat="true">
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field
diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php
index e116f3920..c0a899449 100644
--- a/admin/views/admin_fields_conditions/tmpl/edit.php
+++ b/admin/views/admin_fields_conditions/tmpl/edit.php
@@ -120,7 +120,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 
 
-<?php $numberAddconditions = range(0, count($this->item->addconditions) + 3, 1);?>
+<?php $numberAddconditions = range(0, count( (array) $this->item->addconditions) + 3, 1);?>
 
 // for the values already set
 jQuery(document).ready(function(){
diff --git a/componentbuilder.xml b/componentbuilder.xml
index ae4a8985e..4f0b1cc8d 100644
--- a/componentbuilder.xml
+++ b/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>26th April, 2018</creationDate>
+	<creationDate>27th April, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://joomlacomponentbuilder.com</authorUrl>