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

Updated the readme file.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-05-10 06:47:47 +01:00
parent c9150e930d
commit ee2fea1db8
366 changed files with 473 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1101,7 +1101,7 @@ class Get
}
// add_Ajax for this view
if ($view->add_php_ajax == 1)
if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
{
$addAjaxSite = false;
if (isset($this->siteEditView[$id]) && $this->siteEditView[$id])
@ -1128,16 +1128,20 @@ class Get
$this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value;
}
}
$this->addAjax = true;
unset($view->ajax_input);
}
if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
{
if ($addAjaxSite)
{
$this->customScriptBuilder['site']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
}
$this->customScriptBuilder['admin']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
// unset anyway
unset($view->php_ajaxmethod);
$this->addAjax = true;
unset($view->ajax_input);
}
// unset anyway
unset($view->php_ajaxmethod);
}
// add_sql
if ($view->add_sql == 1)
@ -1303,10 +1307,15 @@ class Get
$this->customScriptBuilder[$this->target]['ajax_controller'][$view->code][$nr][$option] = $value;
}
}
$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
$this->addSiteAjax = true;
unset($view->ajax_input);
}
if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
{
$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
$this->addSiteAjax = true;
}
// unset anyway
unset($view->php_ajaxmethod);
}

1
admin/helpers/compiler/c_Fields.php
View File

@ -1413,6 +1413,7 @@ class Fields extends Structure
'link' => ($field['link']) ? true : false,
'sort' => ($field['sort']) ? true : false,
'custom' => $custom,
'multiple' => $multiple,
'options' => $options);
$this->customBuilderList[$listViewName][] = $name;

18
admin/helpers/compiler/e_Interpretation.php
View File

@ -5065,7 +5065,10 @@ class Interpretation extends Fields
if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
{
$item['id'] = $item['code'];
$item['code'] = $item['code'].'_'.$item['custom']['text'];
if (!$item['multiple'])
{
$item['code'] = $item['code'].'_'.$item['custom']['text'];
}
}
// check if translated vlaue is used
if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
@ -6019,7 +6022,10 @@ class Interpretation extends Fields
if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
{
$item['id'] = $item['code'];
$item['code'] = $item['code'].'_'.$item['custom']['text'];
if (!$item['multiple'])
{
$item['code'] = $item['code'].'_'.$item['custom']['text'];
}
}
// check if translated vlaue is used
if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
@ -10327,11 +10333,17 @@ class Interpretation extends Fields
$fix .= "\n\t".$tab."\t\t\t\t}";
$fix .= "\n\t".$tab."\t\t\t}";
}
elseif ($item['method'] == 1 && !$export)
{
// TODO we check if this works well.
$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');";
}
else
{
if (!$export)
{
// TODO we must add options for multi custom selection.
// For thos we have not cached yet.
$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].");";
}

32
admin/helpers/componentbuilder.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.8
@build 7th May, 2016
@build 10th May, 2016
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php
@ -710,31 +710,33 @@ abstract class ComponentbuilderHelper
return false;
}
public static function jsonToString($value, $sperator = ", ")
public static function jsonToString($value, $sperator = ", ", $table = null)
{
// check if string is JSON
$result = json_decode($value, true);
if (json_last_error() === JSON_ERROR_NONE) {
// is JSON
if (json_last_error() === JSON_ERROR_NONE)
{
// is JSON
if (self::checkArray($result))
{
$value = '';
$counter = 0;
foreach ($result as $string)
if (self::checkString($table))
{
if ($counter)
$names = array();
foreach ($result as $val)
{
$value .= $sperator.$string;
if ($name = self::getVar($table, $val, 'id', 'name'))
{
$names[] = $name;
}
}
else
if (self::checkArray($names))
{
$value .= $string;
}
$counter++;
return (string) implode($sperator,$names);
}
}
return $value;
return (string) implode($sperator,$result);
}
return json_decode($value);
return (string) json_decode($value);
}
return $value;
}

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

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.8
@build 7th May, 2016
@build 10th May, 2016
@created 30th April, 2015
@package Component Builder
@subpackage batch_.php

2
admin/helpers/indenter.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.8
@build 7th May, 2016
@build 10th May, 2016
@created 30th April, 2015
@package Component Builder
@subpackage indenter.php

2
admin/helpers/js.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.8
@build 7th May, 2016
@build 10th May, 2016
@created 30th April, 2015
@package Component Builder
@subpackage js.php

2
admin/helpers/minify.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.1.8
@build 7th May, 2016
@build 10th May, 2016
@created 30th April, 2015
@package Component Builder
@subpackage minify.php