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

Renamed the uikit lib folders. Resolved the gh-188 by updateing the note. Resolved gh-92 by implementation of the library manager in the compiler.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-12-10 21:17:26 +02:00
parent b60d208d9e
commit f900f65baa
700 changed files with 12837 additions and 14154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
admin/models/libraries.php
View File

@ -137,10 +137,12 @@ class ComponentbuilderModelLibraries extends JModelList
{
foreach ($items as $nr => &$item)
{
// convert how
$item->how = $this->selectionTranslation($item->how, 'how');
// convert type
$item->type = $this->selectionTranslation($item->type, 'type');
// convert how
$item->how = $this->selectionTranslation($item->how, 'how');
}
}
@ -156,21 +158,6 @@ class ComponentbuilderModelLibraries extends JModelList
*/
public function selectionTranslation($value,$name)
{
// Array of how language strings
if ($name === 'how')
{
$howArray = array(
1 => 'COM_COMPONENTBUILDER_LIBRARY_ALWAYS_ADD',
2 => 'COM_COMPONENTBUILDER_LIBRARY_CONDITIONS',
3 => 'COM_COMPONENTBUILDER_LIBRARY_CUSTOM_SCRIPT',
0 => 'COM_COMPONENTBUILDER_LIBRARY_DO_NOT_ADD'
);
// Now check if value is found in this array
if (isset($howArray[$value]) && ComponentbuilderHelper::checkString($howArray[$value]))
{
return $howArray[$value];
}
}
// Array of type language strings
if ($name === 'type')
{
@ -184,6 +171,24 @@ class ComponentbuilderModelLibraries extends JModelList
return $typeArray[$value];
}
}
// Array of how language strings
if ($name === 'how')
{
$howArray = array(
1 => 'COM_COMPONENTBUILDER_ALWAYS_ADD',
2 => 'COM_COMPONENTBUILDER_CONDITIONS',
3 => 'COM_COMPONENTBUILDER_CUSTOM_SCRIPT',
4 => 'COM_COMPONENTBUILDER_BUILDIN',
0 => 'COM_COMPONENTBUILDER_DO_NOT_ADD'
);
// Now check if value is found in this array
if (isset($howArray[$value]) && ComponentbuilderHelper::checkString($howArray[$value]))
{
return JText::_($howArray[$value]);
}
}
return $value;
}
@ -246,7 +251,7 @@ class ComponentbuilderModelLibraries extends JModelList
}
}
// Filter by How.
// Filter by how.
if ($how = $this->getState('filter.how'))
{
$query->where('a.how = ' . $db->quote($db->escape($how)));