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

Complete implementation of the language manager/translator feature. #67

Merged
Llewellyn merged 6 commits from staging into master 2017-04-08 22:04:21 +00:00
Conversation 3 Commits 6 Files Changed 228 +29 -24
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7afbb131ce - Show all commits

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

@ -4117,6 +4117,7 @@ class Interpretation extends Fields
public function routerParseSwitch(&$view, $viewArray = null, $aliasView = true, $idView = true) public function routerParseSwitch(&$view, $viewArray = null, $aliasView = true, $idView = true)
{ {
$isCategory = ''; $isCategory = '';
$viewTable = false;
if ($viewArray && ComponentbuilderHelper::checkArray($viewArray)) if ($viewArray && ComponentbuilderHelper::checkArray($viewArray))
{ {
if (isset($viewArray['settings']->main_get->db_table_main) && $viewArray['settings']->main_get->db_table_main === 'categories') if (isset($viewArray['settings']->main_get->db_table_main) && $viewArray['settings']->main_get->db_table_main === 'categories')
@ -4128,29 +4129,25 @@ class Interpretation extends Fields
// $idView = false; // TODO we will keep an eye on this.... // $idView = false; // TODO we will keep an eye on this....
// $aliasView = false; // $aliasView = false;
// } // }
// elseif (isset($viewArray['settings']->main_get->main_get) && ComponentbuilderHelper::checkArray($viewArray['settings']->main_get->main_get)) elseif (isset($viewArray['settings']->main_get->main_get) && ComponentbuilderHelper::checkArray($viewArray['settings']->main_get->main_get))
// { {
// $aliasView = false; foreach ($viewArray['settings']->main_get->main_get as $get)
// foreach ($viewArray['settings']->main_get->main_get as $get) {
// { if ($get['as'] === 'a')
// if ($get['as'] === 'a') {
// { if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection'])
// if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection']) && isset($get['selection']['select_gets'])
// && isset($get['selection']['select_gets']) && ComponentbuilderHelper::checkArray($get['selection']['select_gets']))
// && ComponentbuilderHelper::checkArray($get['selection']['select_gets'])) {
// { if (isset($get['selection']['table']))
// foreach ($get['selection']['select_gets'] as $checkAlias) {
// { $viewTable = str_replace('#__'.$this->fileContentStatic['###component###'].'_', '', $get['selection']['table']);
// if ($checkAlias === "'a.alias'") }
// { }
// $aliasView = true;
// } }
// } }
// } }
//
// }
// }
// }
} }
// add if tags is added, also for all front item views // add if tags is added, also for all front item views
if ($aliasView) if ($aliasView)
@ -4166,7 +4163,15 @@ class Interpretation extends Fields
$routerSwitch[] = "\t\t\t\t}"; $routerSwitch[] = "\t\t\t\t}";
$routerSwitch[] = "\t\t\t\telseif (\$segments[\$count-1])"; $routerSwitch[] = "\t\t\t\telseif (\$segments[\$count-1])";
$routerSwitch[] = "\t\t\t\t{"; $routerSwitch[] = "\t\t\t\t{";
$routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$view."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");"; // we need to get from the table of this views main get the alias so we need the table name
if ($viewTable)
{
$routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$viewTable."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");";
}
else
{
$routerSwitch[] = "\t\t\t\t\t\$id = \$this->getVar('".$view."', \$segments[\$count-1], 'alias', 'id'".$isCategory.");";
}
$routerSwitch[] = "\t\t\t\t\tif(\$id)"; $routerSwitch[] = "\t\t\t\t\tif(\$id)";
$routerSwitch[] = "\t\t\t\t\t{"; $routerSwitch[] = "\t\t\t\t\t{";
$routerSwitch[] = "\t\t\t\t\t\t\$vars['id'] = \$id;"; $routerSwitch[] = "\t\t\t\t\t\t\$vars['id'] = \$id;";