AlexEdimensionz/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Fixed admin_fields_conditions edit view to insure an array gets given to the count function

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2018-04-27 15:45:50 +02:00
parent 74f2d8df56
commit cec566176d
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
10 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 26th April, 2018 + *Last Build*: 27th April, 2018
+ *Version*: 2.7.6 + *Version*: 2.7.6
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *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** + *Field count*: **1027**
+ *File count*: **1201** + *File count*: **1201**
+ *Folder count*: **193** + *Folder count*: **193**

4
admin/README.txt
View File

@ -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) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 26th April, 2018 + *Last Build*: 27th April, 2018
+ *Version*: 2.7.6 + *Version*: 2.7.6
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *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** + *Field count*: **1027**
+ *File count*: **1201** + *File count*: **1201**
+ *Folder count*: **193** + *Folder count*: **193**

2
admin/helpers/compiler/a_Get.php
View File

@ -2116,7 +2116,7 @@ class Get
// Create a new query object. // Create a new query object.
$query = $this->db->getQuery(true); $query = $this->db->getQuery(true);
// Order it by the ordering field. // Select all the values in the field
$query->select('a.*'); $query->select('a.*');
$query->select($this->db->quoteName(array('c.name', 'c.properties'), array('type_name', 'properties'))); $query->select($this->db->quoteName(array('c.name', 'c.properties'), array('type_name', 'properties')));
$query->from('#__componentbuilder_field AS a'); $query->from('#__componentbuilder_field AS a');

3
admin/models/forms/admin_fields.xml
View File

@ -105,7 +105,8 @@
layout="joomla.form.field.subform.repeatable-table" layout="joomla.form.field.subform.repeatable-table"
multiple="true" multiple="true"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
icon="list"> icon="list"
min="1">
<form hidden="true" name="list_addfields_modal" repeat="true"> <form hidden="true" name="list_addfields_modal" repeat="true">
<!-- Field Field. Type: Fields. (custom) --> <!-- Field Field. Type: Fields. (custom) -->
<field <field

4
admin/models/forms/admin_view.xml
View File

@ -1140,7 +1140,9 @@
label="COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL" label="COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL"
layout="joomla.form.field.subform.repeatable-table" layout="joomla.form.field.subform.repeatable-table"
multiple="true" multiple="true"
icon="list"> icon="list"
max="20"
min="1">
<form hidden="true" name="list_custom_button_modal" repeat="true"> <form hidden="true" name="list_custom_button_modal" repeat="true">
<!-- Icomoon Field. Type: List. (joomla) --> <!-- Icomoon Field. Type: List. (joomla) -->
<field <field

3
admin/models/forms/component_admin_views.xml
View File

@ -105,7 +105,8 @@
layout="joomla.form.field.subform.repeatable-table" layout="joomla.form.field.subform.repeatable-table"
multiple="true" multiple="true"
description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_DESCRIPTION" 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"> <form hidden="true" name="list_addadmin_views_modal" repeat="true">
<!-- Adminview Field. Type: Adminviews. (custom) --> <!-- Adminview Field. Type: Adminviews. (custom) -->
<field <field

4
admin/models/forms/custom_admin_view.xml
View File

@ -611,7 +611,9 @@
label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL" label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL"
layout="joomla.form.field.subform.repeatable-table" layout="joomla.form.field.subform.repeatable-table"
multiple="true" multiple="true"
icon="list"> icon="list"
max="20"
min="1">
<form hidden="true" name="list_custom_button_modal" repeat="true"> <form hidden="true" name="list_custom_button_modal" repeat="true">
<!-- Icomoon Field. Type: List. (joomla) --> <!-- Icomoon Field. Type: List. (joomla) -->
<field <field

4
admin/models/forms/site_view.xml
View File

@ -630,7 +630,9 @@
label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_LABEL" label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_LABEL"
layout="joomla.form.field.subform.repeatable-table" layout="joomla.form.field.subform.repeatable-table"
multiple="true" multiple="true"
icon="list"> icon="list"
max="20"
min="1">
<form hidden="true" name="list_custom_button_modal" repeat="true"> <form hidden="true" name="list_custom_button_modal" repeat="true">
<!-- Icomoon Field. Type: List. (joomla) --> <!-- Icomoon Field. Type: List. (joomla) -->
<field <field

2
admin/views/admin_fields_conditions/tmpl/edit.php
View File

@ -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 // for the values already set
jQuery(document).ready(function(){ jQuery(document).ready(function(){

2
componentbuilder.xml
View File

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