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

Removing repetable fields from site view, custom admin view, and admin view. Also updated the compiler, removed permissions on fields to speedup page load in admin and joomla component views

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-10-12 02:50:14 +02:00
parent c484306d21
commit 39e1e5f078
331 changed files with 4920 additions and 8617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
admin/models/field.php
View File

@ -131,7 +131,7 @@ class ComponentbuilderModelField extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_componentbuilder.field');
}
}
$this->addfieldsvvwd = $item->id;
$this->addfieldsvvwc = $item->id;
return $item;
}
@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getWaclinked_admin_views()
public function getWablinked_admin_views()
{
// Get the user object.
$user = JFactory::getUser();
@ -181,32 +181,15 @@ class ComponentbuilderModelField extends JModelAdmin
{
$items = $db->loadObjectList();
// set values to display correctly.
if (ComponentbuilderHelper::checkArray($items))
{
// get user object.
$user = JFactory::getUser();
foreach ($items as $nr => &$item)
{
$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder'));
if (!$access)
{
unset($items[$nr]);
continue;
}
}
}
// Filter by addfieldsvvwd in this Repetable Field
if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwd))
// Filter by addfieldsvvwc in this Repetable Field
if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc))
{
foreach ($items as $nr => &$item)
{
if (isset($item->addfields) && ComponentbuilderHelper::checkJson($item->addfields))
{
$tmpArray = json_decode($item->addfields,true);
if (!isset($tmpArray['field']) || !ComponentbuilderHelper::checkArray($tmpArray['field']) || !in_array($this->addfieldsvvwd, $tmpArray['field']))
if (!isset($tmpArray['field']) || !ComponentbuilderHelper::checkArray($tmpArray['field']) || !in_array($this->addfieldsvvwc, $tmpArray['field']))
{
unset($items[$nr]);
continue;