joomla/Component-Builder
40
26
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

Added the option to Manage JCB Package Directories in the globle Options area

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-05-03 16:04:47 +02:00
parent 47f90de990
commit 3329aad3c7
8 changed files with 138 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
admin/views/import_joomla_components/view.html.php
View File

@@ -42,6 +42,7 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
protected $packageInfo;
protected $formPackage;
protected $vdmPackages = false;
protected $directories = array();
public function display($tpl = null)
{
@@ -79,12 +80,26 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
{
$this->dataType = $session->get('dataType_VDM_IMPORTINTO', null);
}
// get the management input from global settings
$manageDirectories = $this->params->get('manage_jcb_package_directories', 2);
if ($manageDirectories == 2)
{
$this->directories = array('vdm','jcb');
}
elseif ($manageDirectories == 1)
{
$this->directories = (array) $this->params->get('jcb_package_directories');
}
// set form only if smart package
if ($this->dataType === 'smart_package')
{
$this->packageInfo = json_decode($session->get('smart_package_info', false), true);
// add the form class
jimport('joomla.form.form');
// load the forms
$this->formPackage = $this->_getForm($this->dataType);
$this->vdmPackages = $this->_getForm('vdm_package');
@@ -308,7 +323,7 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
$form[] = $sleutle;
}
}
elseif ('vdm_package' === $type && $vdmListObjects = ComponentbuilderHelper::getGithubRepoFileList('vdmGithubPackages', ComponentbuilderHelper::$vdmGithubPackagesUrl.ComponentbuilderHelper::$accessToken))
elseif ('vdm_package' === $type && in_array('vdm', $this->directories) && $vdmListObjects = ComponentbuilderHelper::getGithubRepoFileList('vdmGithubPackages', ComponentbuilderHelper::$vdmGithubPackagesUrl.ComponentbuilderHelper::$accessToken))
{
if (ComponentbuilderHelper::checkArray($vdmListObjects))
{
@@ -352,7 +367,7 @@ class ComponentbuilderViewImport_joomla_components extends JViewLegacy
}
}
}
elseif ('jcb_package' === $type && $jcbListObjects = ComponentbuilderHelper::getGithubRepoFileList('communityGithubPackages', ComponentbuilderHelper::$jcbGithubPackagesUrl.ComponentbuilderHelper::$accessToken))
elseif ('jcb_package' === $type && in_array('jcb', $this->directories) && $jcbListObjects = ComponentbuilderHelper::getGithubRepoFileList('communityGithubPackages', ComponentbuilderHelper::$jcbGithubPackagesUrl.ComponentbuilderHelper::$accessToken))
{
if (ComponentbuilderHelper::checkArray($jcbListObjects))
{