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

Fixed javascript overload in the field conditions area. Fixed a dynamicGet error that linked the wrong tables with eachother. Fixed gh-519 so that the form is loaded around pagination, note that this may break some implementation, but this fix will allow for a more correct html.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-02-05 01:18:34 +02:00
parent 6719a7008b
commit 12c456ca6b
31 changed files with 418 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2115,7 +2115,7 @@ class Get
{
// load the field details
$required = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'required="', '"');
$required = ($required == true) ? 'yes' : 'no';
$required = ($required === 'true' || $required === '1') ? 'yes' : 'no';
$filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'filter="', '"');
$filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none';
// set the field name

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

@ -159,11 +159,11 @@ class Interpretation extends Fields
public $customAdminAdded = array();
/**
* Switch to add form to site views
* Switch to add form to views
*
* @var array
*/
public $addSiteForm = array();
public $addCustomForm = array();
/**
* The extensions params
@ -3365,17 +3365,6 @@ class Interpretation extends Fields
{
$method .= PHP_EOL . $this->_t(2) . "\$this->pagination = \$this->get('Pagination');";
}
// add id to list view
if (isset($this->customAdminViewListId[$view['settings']->code]))
{
// HIDDEN_INPUT_VALUES
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'HIDDEN_INPUT_VALUES' . $this->hhh] = PHP_EOL . $this->_t(1) . '<input type="hidden" name="id" value="<?php echo $this->app->input->getInt(\'id\', 0); ?>" />';
}
else
{
// also set the input value HIDDEN_INPUT_VALUES
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'HIDDEN_INPUT_VALUES' . $this->hhh] = '';
}
}
// add the custom get methods
if (isset($view['settings']->custom_get) && ComponentbuilderHelper::checkArray($view['settings']->custom_get))
@ -3766,14 +3755,14 @@ class Interpretation extends Fields
// return buttons if they were build
if (ComponentbuilderHelper::checkArray($buttons))
{
// only for site views
if ('site' === $this->target)
// set the custom get form method JAVASCRIPT_FOR_BUTTONS
$this->fileContentDynamic[$view['settings']->code][$this->hhh . $TARGET . '_JAVASCRIPT_FOR_BUTTONS' . $this->hhh] = $this->setJavaScriptForButtons();
// insure the form is added (only if not form exist)
if (isset($view['settings']->default) && strpos($view['settings']->default, '<form') === false)
{
// set the custom get form method SITE_JAVASCRIPT_FOR_BUTTONS
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_JAVASCRIPT_FOR_BUTTONS' . $this->hhh] = $this->setJavaScriptForButtons();
// insure the form is added
$this->addSiteForm[$view['settings']->code] = true;
$this->addCustomForm[$this->target][$view['settings']->code] = true;
}
return PHP_EOL . implode(PHP_EOL, $buttons);
}
}
@ -4458,32 +4447,59 @@ class Interpretation extends Fields
$body[] = $this->_t(2) . '<?php echo $this->pagination->getPagesLinks(); ?>';
$body[] = $this->_t(1) . '</div>';
$body[] = '<?php endif; ?>';
// insure the form is added
$this->addSiteForm[$view['settings']->code] = true;
// insure the form is added (only if no form exist)
if (strpos($view['settings']->default, '<form') === false)
{
$this->addCustomForm[$this->target][$view['settings']->code] = true;
}
// return the body
return implode(PHP_EOL, $body);
}
else
{
// insure the form is added (only if no form exist)
if ('admin' === $this->target && strpos($view['settings']->default, '<form') === false)
{
$this->addCustomForm[$this->target][$view['settings']->code] = true;
}
return PHP_EOL . $this->setPlaceholders($view['settings']->default, $this->placeholders);
}
}
return '';
}
public function setCustomViewForm(&$view, $type)
public function setCustomViewForm(&$view, &$gettype, $type)
{
if (isset($this->addSiteForm[$view]) && $this->addSiteForm[$view])
if (isset($this->addCustomForm[$this->target]) && isset($this->addCustomForm[$this->target][$view]) && $this->addCustomForm[$this->target][$view])
{
switch($type)
{
case 1:
// top
return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '\'); ?>" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
if ('site' === $this->target)
{
return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '\'); ?>" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
}
else
{
if ($gettype == 2)
{
return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '&view=' . $view . '\'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">' . PHP_EOL;
}
else
{
return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '&view=' . $view . '\' . $urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">' . PHP_EOL;
}
}
break;
case 2:
// bottom
return PHP_EOL . '<input type="hidden" name="task" value="" />' . PHP_EOL . "<?php echo JHtml::_('form.token'); ?>" . PHP_EOL . '</form>';
$input = '';
if ('admin' === $this->target && isset($this->customAdminViewListId[$view]))
{
$input = PHP_EOL . $this->_t(1) . '<input type="hidden" name="id" value="<?php echo $this->app->input->getInt(\'id\', 0); ?>" />';
}
return $input . PHP_EOL . '<input type="hidden" name="task" value="" />' . PHP_EOL . "<?php echo JHtml::_('form.token'); ?>" . PHP_EOL . '</form>';
break;
}
}
@ -4495,7 +4511,7 @@ class Interpretation extends Fields
if (ComponentbuilderHelper::checkString($view['settings']->default))
{
// add the script only if there is none set
if (strpos($view['settings']->default, 'Joomla.submitbutton = function(task)') === false)
if (strpos($view['settings']->default, 'Joomla.submitbutton = function(') === false)
{
$script = array();
$script[] = PHP_EOL . "<script type=\"text/javascript\">";

8
admin/helpers/compiler/f_Infusion.php
View File

@ -698,6 +698,10 @@ class Infusion extends Interpretation
// setup the templates
$this->setCustomViewTemplateBody($view);
// set the site form if needed
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 1);
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 2);
// Trigger Event: jcb_ce_onAfterBuildCustomAdminViewContent
$this->triggerEvent('jcb_ce_onAfterBuildCustomAdminViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
}
@ -940,8 +944,8 @@ class Infusion extends Interpretation
$this->setCustomViewTemplateBody($view);
// set the site form if needed
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 1);
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 2);
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 1);
$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 2);
// Trigger Event: jcb_ce_onAfterBuildSiteViewContent
$this->triggerEvent('jcb_ce_onAfterBuildSiteViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));