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

Added version options to JCB, also changed JCB version option to only first 2 numbers. This should help cut down on the commit changes to JCB on each compilation.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-11-06 16:04:23 +02:00
parent 9e6c93a51e
commit fe3f32c6e7
772 changed files with 3186 additions and 3136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -747,7 +747,14 @@ class Interpretation extends Fields
// update the component update table
$newU = array();
$newU['id'] = (int) $this->componentData->version_update_id;
if (isset($this->componentData->version_update_id) && $this->componentData->version_update_id > 0)
{
$newU['id'] = (int) $this->componentData->version_update_id;
}
else
{
$newU['joomla_component'] = (int) $this->componentID;
}
$newU['version_update'] = json_encode($buket);
// update the component with the new dynamic SQL
$modelU = ComponentbuilderHelper::getModel('component_updates');
@ -4140,7 +4147,7 @@ class Interpretation extends Fields
$script .= PHP_EOL."\t\t\t".'echo \'<a target="_blank" href="'.$this->fileContentStatic['###AUTHORWEBSITE###'].'" title="'.$this->fileContentStatic['###Component_name###'].'">';
$script .= PHP_EOL."\t\t\t\t".'<img src="components/com_'.$this->fileContentStatic['###component###'].'/assets/images/vdm-component.'.$this->componentImageType.'"/>';
$script .= PHP_EOL."\t\t\t\t".'</a>';
$script .= PHP_EOL."\t\t\t\t<h3>Upgrade to Version ".$this->fileContentStatic['###VERSION###']." Was Successful! Let us know if anything is not working as expected.</h3>';";
$script .= PHP_EOL."\t\t\t\t<h3>Upgrade to Version ".$this->fileContentStatic['###ACTUALVERSION###']." Was Successful! Let us know if anything is not working as expected.</h3>';";
}
if (ComponentbuilderHelper::checkString($script))

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

@ -118,6 +118,27 @@ class Infusion extends Interpretation
// ###VERSION###
$this->fileContentStatic['###VERSION###'] = trim($this->componentData->component_version);
// set the actual global version
$this->fileContentStatic['###ACTUALVERSION###'] = $this->fileContentStatic['###VERSION###'];
// do some Tweaks to the version based on selected options
if (strpos($this->fileContentStatic['###VERSION###'], '.') !== false)
{
$versionArray = explode('.', $this->fileContentStatic['###VERSION###']);
}
// load only first two values
if (isset($versionArray) && ComponentbuilderHelper::checkArray($versionArray) && $this->componentData->mvc_versiondate == 2)
{
$this->fileContentStatic['###VERSION###'] = $versionArray[0] . '.' . $versionArray[1] . '.x';
}
// load only the first value
elseif (isset($versionArray) && ComponentbuilderHelper::checkArray($versionArray) && $this->componentData->mvc_versiondate == 3)
{
$this->fileContentStatic['###VERSION###'] = $versionArray[0]. '.x.x';
}
unset($versionArray);
// set the global version in case
$this->fileContentStatic['###VERSION###GLOBAL'] = $this->fileContentStatic['###VERSION###'];
// ###Component_name###