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

convert repeatable properties field in the field types view to subform field

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-09-18 04:20:50 +02:00
parent 06416e665d
commit 9e140b40da
249 changed files with 705 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1753,7 +1753,7 @@ class Get
// Order it by the ordering field.
$query->select('a.*');
$query->select($this->db->quoteName(array('c.name', 'c.properties'),array('type_name','type_properties')));
$query->select($this->db->quoteName(array('c.name', 'c.properties'),array('type_name','properties')));
$query->from('#__componentbuilder_field AS a');
$query->join('LEFT', $this->db->quoteName('#__componentbuilder_fieldtype', 'c') . ' ON (' . $this->db->quoteName('a.fieldtype') . ' = ' . $this->db->quoteName('c.id') . ')');
$query->where($this->db->quoteName('a.id') . ' = '. $this->db->quote($id));
@ -1773,19 +1773,8 @@ class Get
$field->xml = $this->setDynamicValues(json_decode($field->xml));
// load the type values form type params
$properties = json_decode($field->type_properties,true);
unset($field->type_properties);
$field->properties = json_decode($field->properties,true);
if (ComponentbuilderHelper::checkArray($properties))
{
foreach ($properties as $option => $values)
{
foreach ($values as $nr => $value)
{
$field->properties[$nr][$option] = $value;
}
}
}
// check if we have advanced encryption
if (4 == $field->store && (!isset($this->advancedEncryption) || !$this->advancedEncryption))
{

14
admin/helpers/componentbuilder.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
@ -265,20 +265,18 @@ abstract class ComponentbuilderHelper
{
$result = $db->loadObject();
$properties = json_decode($result->properties,true);
$pointer = 0;
$field = array('values' => "<field ", 'values_description' => '<ul>', 'short_description' => $result->short_description, 'description' => $result->description);
foreach ($properties['name'] as $line)
foreach ($properties as $property)
{
$field['values_description'] .= '<li><b>'.$properties['name'][$pointer].'</b> '.$properties['description'][$pointer].'</li>';
if(isset($settings[$properties['name'][$pointer]]))
$field['values_description'] .= '<li><b>'.$property['name'].'</b> '.$property['description'].'</li>';
if(isset($settings[$property['name']]))
{
$field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$settings[$properties['name'][$pointer]].'" ';
$field['values'] .= "\n\t".$property['name'].'="'.$settings[$property['name']].'" ';
}
else
{
$field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$properties['example'][$pointer].'" ';
$field['values'] .= "\n\t".$property['name'].'="'.$property['example'].'" ';
}
$pointer++;
}
$field['values'] .= "\n/>";
$field['values_description'] .= '</ul>';

2
admin/helpers/componentbuilderemail.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilderemail.php

2
admin/helpers/headercheck.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage headercheck.php

2
admin/helpers/html/batch_.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage batch_.php

2
admin/helpers/indenter.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage indenter.php

2
admin/helpers/js.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage js.php

2
admin/helpers/minify.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.5
@build 17th September, 2017
@build 18th September, 2017
@created 30th April, 2015
@package Component Builder
@subpackage minify.php