joomla/Component-Builder
39
25
Fork 11
Code Issues 76 Pull Requests Projects 4 Wiki Activity

Fixed a few bugs in connection to v2.6.0 and also made a few tweaks to the fields field

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-11-03 01:41:32 +02:00
parent f85925c933
commit 0976f79940
302 changed files with 631 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/models/fields/fields.php
View File

@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.6.0
@build 1st November, 2017
@version 2.6.1
@build 2nd November, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php
@ -151,8 +151,9 @@ class JFormFieldFields extends JFormFieldList
{
$db = JFactory::getDBO();
$query = $db->getQuery(true);
$query->select($db->quoteName(array('a.id','a.name'),array('id','field_name')));
$query->from($db->quoteName('#__componentbuilder_field', 'a'));
$query->select($db->quoteName(array('a.id','a.name','b.name'),array('id','field_name','type')));
$query->from($db->quoteName('#__componentbuilder_field', 'a'));
$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
$query->where($db->quoteName('a.published') . ' >= 1');
$query->order('a.name ASC');
$db->setQuery((string)$query);
@ -163,7 +164,7 @@ class JFormFieldFields extends JFormFieldList
$options[] = JHtml::_('select.option', '', 'Select an option');
foreach($items as $item)
{
$options[] = JHtml::_('select.option', $item->id, $item->field_name);
$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [' . $item->type . ']');
}
}
return $options;