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

Fixed some collusion issue in the dynamic get build process when custom query is used. Fixed the issue found in the import of JCB packages that caused custom code to be imported in duplication, also added the option to turn off (unpublish) custom code no longer in use.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-08-30 18:33:30 +02:00
parent be0d61ceae
commit b3c4414320
12 changed files with 412 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
admin/models/ajax.php
View File

@ -594,39 +594,12 @@ class ComponentbuilderModelAjax extends JModelList
// set the number of rows
$this->rowNumber = count($rows);
// return the table
return $this->setSubformTable($head, $rows, $idName);
return ComponentbuilderHelper::setSubformTable($head, $rows, $idName);
}
}
return false;
}
protected function setSubformTable($head, $rows, $idName)
{
$table[] = "<div class=\"row-fluid\" id=\"vdm_table_display_".$idName."\">";
$table[] = "\t<div class=\"subform-repeatable-wrapper subform-table-layout subform-table-sublayout-section-byfieldsets\">";
$table[] = "\t\t<div class=\"subform-repeatable\">";
$table[] = "\t\t\t<table class=\"adminlist table table-striped table-bordered\">";
$table[] = "\t\t\t\t<thead>";
$table[] = "\t\t\t\t\t<tr>";
$table[] = "\t\t\t\t\t\t<th>" . implode("</th><th>", $head) . "</th>";
$table[] = "\t\t\t\t\t</tr>";
$table[] = "\t\t\t\t</thead>";
$table[] = "\t\t\t\t<tbody>";
foreach ($rows as $row)
{
$table[] = "\t\t\t\t\t<tr class=\"subform-repeatable-group\">";
$table[] = "\t\t\t\t\t\t" . $row;
$table[] = "\t\t\t\t\t</tr>";
}
$table[] = "\t\t\t\t</tbody>";
$table[] = "\t\t\t</table>";
$table[] = "\t\t</div>";
$table[] = "\t</div>";
$table[] = "</div>";
// return the table
return implode("\n", $table);
}
protected function setSubformValue($header, $value)
{
if (array_key_exists($header, $this->functionArray) && method_exists($this, $this->functionArray[$header]))

1
admin/models/compiler.php
View File

@ -119,7 +119,6 @@ class ComponentbuilderModelCompiler extends JModelList
return $items;
}
/**
* Get the uikit needed components
*

1
admin/models/get_snippets.php
View File

@ -115,7 +115,6 @@ class ComponentbuilderModelGet_snippets extends JModelList
return $items;
}
/**
* Get the uikit needed components
*

74
admin/models/import_joomla_components.php
View File

@ -749,6 +749,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
{
if (isset($this->data[$table]) && ComponentbuilderHelper::checkArray($this->data[$table]))
{
// add pre import event
$this->preImportEvent($table);
// get global action permissions
$canDo = ComponentbuilderHelper::getActions($table);
$canEdit = $canDo->get('core.edit');
@ -836,6 +838,38 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
return true;
}
/**
* Check if this table needs some house cleaning before we import the data
*
* @return void
*
**/
protected function preImportEvent($table)
{
// if this is custom code table
// remove all custom code linked to these components
// since some code may have been removed and changed
// best unpublish all and let the import publish those still active
if ('custom_code' === $table && isset($this->newID['joomla_component']) && ComponentbuilderHelper::checkArray($this->newID['joomla_component']))
{
$query = $this->_db->getQuery(true);
// Field to update.
$fields = array(
$this->_db->quoteName('published') . ' = 0'
);
// Conditions for which records should be updated.
$conditions = array(
$this->_db->quoteName('component') . ' IN (' . implode(', ', array_values($this->newID['joomla_component'])) . ')'
);
$query->update($this->_db->quoteName('#__componentbuilder_custom_code'))->set($fields)->where($conditions);
$this->_db->setQuery($query);
$this->_db->execute();
}
}
/**
* Check if we should allow merge for this table
*
@ -2706,28 +2740,38 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
case 'custom_code':
// search for custom code
$getter = array('comment_type', 'target');
// add some more advanced search
if (isset($item->path) && ComponentbuilderHelper::checkString($item->path))
$this->specialValue = array();
// search for Hash (automation)
if (isset($item->target) && $item->target == 1)
{
$getter[] = 'path';
$getter[] = 'hashtarget';
$getter[] = 'component';
// Yet if diverged it makes sense that the ID is updated.
if ($diverged)
{
// set a special value
$this->specialValue['component'] = (int) $item->component;
}
elseif (isset($this->newID['joomla_component'][(int) $item->component]))
{
// set a special value
$this->specialValue['component'] = $this->newID['joomla_component'][(int) $item->component];
}
// (TODO) I have seen this happen, seems dangerous!
else
{
return false;
}
}
// add function name search
if (isset($item->function_name) && ComponentbuilderHelper::checkString($item->function_name))
// search for JCB (manual)
elseif (isset($item->target) && $item->target == 2)
{
$getter[] = 'function_name';
// remove path
if (($key = array_search('path', $getter)) !== false) {
unset($getter[$key]);
}
}
// add hash target search
elseif (isset($item->hashtarget) && ComponentbuilderHelper::checkString($item->hashtarget))
else
{
$getter[] = 'hashtarget';
// remove function name
if (($key = array_search('function_name', $getter)) !== false) {
unset($getter[$key]);
}
return false;
}
break;
case 'dynamic_get':