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

Imporved the field display on admin fields conditions to only show fields linked to the admin view. Added access back to all JCB admin views. Fixed the export of JCB packages to include the new admin_fields and admin_flieds_conditions tables. Adapted the JCB package import method to be able to import old JCB packages

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-10-19 05:53:55 +02:00
parent 6c29a6fca1
commit f7d5ac84c4
367 changed files with 1486 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
admin/models/admins_fields_conditions.php
View File

@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 15 of this MVC
@version @update number 16 of this MVC
@build 16th October, 2017
@created 12th October, 2017
@package Component Builder
@ -156,6 +156,21 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList
$query->where('(a.published = 0 OR a.published = 1)');
}
// Join over the asset groups.
$query->select('ag.title AS access_level');
$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
// Filter by access level.
if ($access = $this->getState('filter.access'))
{
$query->where('a.access = ' . (int) $access);
}
// Implement View Level Access
if (!$user->authorise('core.options', 'com_componentbuilder'))
{
$groups = implode(',', $user->getAuthorisedViewLevels());
$query->where('a.access IN (' . $groups . ')');
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
$orderDirn = $this->state->get('list.direction', 'asc');