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

2
admin/models/fields/adminviewfolderlist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviewfolderlist.php

2
admin/models/fields/adminviews.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php

2
admin/models/fields/articles.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage articles.php

2
admin/models/fields/component.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage component.php

2
admin/models/fields/components.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage components.php

2
admin/models/fields/customadminviews.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php

2
admin/models/fields/customfilelist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php

2
admin/models/fields/customfolderlist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php

2
admin/models/fields/customgets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php

2
admin/models/fields/dbtables.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php

2
admin/models/fields/dynamicget.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicget.php

2
admin/models/fields/dynamicgets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php

2
admin/models/fields/fields.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

2
admin/models/fields/fieldtypes.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

2
admin/models/fields/ftps.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage ftps.php

2
admin/models/fields/lang.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage lang.php

2
admin/models/fields/maingets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php

30
admin/models/fields/matchfield.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage matchfield.php
@ -160,22 +160,28 @@ class JFormFieldMatchfield extends JFormFieldList
if (is_numeric($ID) && $ID >= 1)
{
// get the admin view ID
if ($adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view'))
$adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view');
}
else
{
// get the admin view ID
$adminView = $jinput->getInt('refid', 0);
}
if (is_numeric($adminView) && $adminView >= 1)
{
// get all the fields linked to the admin view
if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
{
// get all the fields linked to the admin view
if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
if (ComponentbuilderHelper::checkJson($addFields))
{
if (ComponentbuilderHelper::checkJson($addFields))
$addFields = json_decode($addFields, true);
if (ComponentbuilderHelper::checkArray($addFields))
{
$addFields = json_decode($addFields, true);
if (ComponentbuilderHelper::checkArray($addFields))
foreach($addFields as $addField)
{
foreach($addFields as $addField)
if (isset($addField['field']))
{
if (isset($addField['field']))
{
$fieldIds[] = (int) $addField['field'];
}
$fieldIds[] = (int) $addField['field'];
}
}
}

2
admin/models/fields/siteviewfolderlist.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviewfolderlist.php

2
admin/models/fields/siteviews.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php

2
admin/models/fields/snippets.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

30
admin/models/fields/targetfields.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage targetfields.php
@ -160,22 +160,28 @@ class JFormFieldTargetfields extends JFormFieldList
if (is_numeric($ID) && $ID >= 1)
{
// get the admin view ID
if ($adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view'))
$adminView = ComponentbuilderHelper::getVar('admin_fields_conditions', (int) $ID, 'id', 'admin_view');
}
else
{
// get the admin view ID
$adminView = $jinput->getInt('refid', 0);
}
if (is_numeric($adminView) && $adminView >= 1)
{
// get all the fields linked to the admin view
if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
{
// get all the fields linked to the admin view
if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
if (ComponentbuilderHelper::checkJson($addFields))
{
if (ComponentbuilderHelper::checkJson($addFields))
$addFields = json_decode($addFields, true);
if (ComponentbuilderHelper::checkArray($addFields))
{
$addFields = json_decode($addFields, true);
if (ComponentbuilderHelper::checkArray($addFields))
foreach($addFields as $addField)
{
foreach($addFields as $addField)
if (isset($addField['field']))
{
if (isset($addField['field']))
{
$fieldIds[] = (int) $addField['field'];
}
$fieldIds[] = (int) $addField['field'];
}
}
}

2
admin/models/fields/viewtabs.php
View File

@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.8
@build 16th October, 2017
@build 18th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage viewtabs.php