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

Trying to remove random variable changes per/build, or at least to cut it down in a major way.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-02-26 15:57:30 +02:00
parent 2ecf186846
commit 15e3c82dd2
35 changed files with 1715 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
admin/models/admin_view.php
View File

@ -210,7 +210,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_componentbuilder.admin_view');
}
}
$this->idfazo = $item->addfields;
$this->idvvvx = $item->addfields;
return $item;
}
@ -220,7 +220,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getRwqfields()
public function getVwzfields()
{
// Get the user object.
$user = JFactory::getUser();
@ -288,26 +288,26 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
$item->datatype = $this->selectionTranslationRwqfields($item->datatype, 'datatype');
$item->datatype = $this->selectionTranslationVwzfields($item->datatype, 'datatype');
// convert indexes
$item->indexes = $this->selectionTranslationRwqfields($item->indexes, 'indexes');
$item->indexes = $this->selectionTranslationVwzfields($item->indexes, 'indexes');
// convert null_switch
$item->null_switch = $this->selectionTranslationRwqfields($item->null_switch, 'null_switch');
$item->null_switch = $this->selectionTranslationVwzfields($item->null_switch, 'null_switch');
// convert store
$item->store = $this->selectionTranslationRwqfields($item->store, 'store');
$item->store = $this->selectionTranslationVwzfields($item->store, 'store');
}
}
// Filter by id Repetable Field
$idfazo = json_decode($this->idfazo,true);
if (ComponentbuilderHelper::checkArray($items) && isset($idfazo) && ComponentbuilderHelper::checkArray($idfazo))
$idvvvx = json_decode($this->idvvvx,true);
if (ComponentbuilderHelper::checkArray($items) && isset($idvvvx) && ComponentbuilderHelper::checkArray($idvvvx))
{
foreach ($items as $nr => &$item)
{
if ($item->id && isset($idfazo['field']) && ComponentbuilderHelper::checkArray($idfazo['field']))
if ($item->id && isset($idvvvx['field']) && ComponentbuilderHelper::checkArray($idvvvx['field']))
{
if (!in_array($item->id,$idfazo['field']))
if (!in_array($item->id,$idvvvx['field']))
{
unset($items[$nr]);
continue;
@ -329,7 +329,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
*
* @return translatable string
*/
protected function selectionTranslationRwqfields($value,$name)
protected function selectionTranslationVwzfields($value,$name)
{
// Array of datatype language strings
if ($name == 'datatype')