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

Fixed the site view menu not being build as a result of new feature that builds edit site view menu.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-04-14 22:20:01 +02:00
parent a817bae010
commit 44451f1017
8 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1160,8 +1160,12 @@ class Structure extends Get
*/
public function buildDynamique($target, $type, $fileName = false, $config = false)
{
// did we build the files (any number)
$build_status = false;
// check that we have the target values
if (ComponentbuilderHelper::checkArray($target))
{
// search the target
foreach ($target as $main => $name)
{
// make sure it is lower case
@ -1169,7 +1173,7 @@ class Structure extends Get
// setup the files
foreach ($this->joomlaVersionData->move->dynamic->{$main} as $item => $details)
{
if ($details->type == $type)
if ($details->type === $type)
{
// set destination path
$path = '';
@ -1228,12 +1232,13 @@ class Structure extends Get
}
// store the new files
$this->newFiles['dynamic'][$name][] = $newFIle;
// we have build atleast one
$build_status = true;
}
}
}
return true;
}
return false;
return $build_status;
}
/**

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

@ -1473,10 +1473,10 @@ class Interpretation extends Fields
public function setAdminViewMenu(&$viewName_single, &$view)
{
$xml = '';
// build the file
// build the file target values
$target = array('site' => $viewName_single);
$done = $this->buildDynamique($target, 'admin_menu');
if ($done)
// build the edit.xml file
if ($this->buildDynamique($target, 'admin_menu'))
{
// set the lang
$lang = ComponentbuilderHelper::safeString('com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_menu_' . $viewName_single, 'U');
@ -1493,16 +1493,20 @@ class Interpretation extends Fields
$xml .= PHP_EOL . $this->_t(1) . '</layout>';
$xml .= PHP_EOL . '</metadata>';
}
else
{
$this->app->enqueueMessage(JText::sprintf('<hr /><p>Site menu for <b>%s</b> was not build.</p>', $viewName_single), 'Warning');
}
return $xml;
}
public function setCustomViewMenu(&$view)
{
$xml = '';
// build the file
// build the file target values
$target = array('site' => $view['settings']->code);
$done = $this->buildDynamique($target, 'menu');
if ($done)
// build the default.xml file
if ($this->buildDynamique($target, 'menu'))
{
// set the lang
$lang = ComponentbuilderHelper::safeString('com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_menu_' . $view['settings']->code, 'U');
@ -1560,6 +1564,10 @@ class Interpretation extends Fields
}
$xml .= PHP_EOL . '</metadata>';
}
else
{
$this->app->enqueueMessage(JText::sprintf('<hr /><p>Site menu for <b>%s</b> was not build.</p>', $view['settings']->code), 'Warning');
}
return $xml;
}
@ -1573,10 +1581,9 @@ class Interpretation extends Fields
$target = ComponentbuilderHelper::getBetween($field, 'display="', '"');
if (!ComponentbuilderHelper::checkString($target) || $target === 'menu')
{
$field = str_replace('display="menu"', '', $field);
// we load fields that have options
if (strpos($field, 'Option Set. -->') !== false && strpos($field, $menuSetter) === false && !ComponentbuilderHelper::checkString($target))
// we update fields that have options if not only added to menu
if ($target !== 'menu' && strpos($field, 'Option Set. -->') !== false && strpos($field, $menuSetter) === false && !ComponentbuilderHelper::checkString($target))
{
// we add the global option
$field = str_replace('Option Set. -->', $this->setLine(__LINE__) . ' Global & Option Set. -->' . PHP_EOL . $this->_t(3) . '<option value="">' . PHP_EOL . $this->_t(4) . 'JGLOBAL_USE_GLOBAL</option>', $field);