Decoupled fields and conditions from admin view as explained in gh-136. Added new admin_fields and admin_fields_conditions tables and moved the data from admin_view to these new tables.

This commit is contained in:
2017-10-13 01:14:17 +02:00
parent 39e1e5f078
commit 35482416cb
367 changed files with 8762 additions and 2210 deletions

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,11 +10,11 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage publlshing.php
@subpackage metadata.php
@author Llewellyn van der Merwe <http://vdm.bz/component-builder>
@copyright Copyright (C) 2015. All Rights Reserved
@license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
@@ -27,34 +27,30 @@
defined('_JEXEC') or die('Restricted access');
$app = JFactory::getApplication();
$form = $displayData->getForm();
$fields = $displayData->get('fields') ?: array(
'published',
'ordering',
'access',
'version',
'hits',
'id'
);
// JLayout for standard handling of metadata fields in the administrator content edit screens.
$fieldSets = $form->getFieldsets('metadata');
?>
$hiddenFields = $displayData->get('hidden_fields') ?: array();
<?php foreach ($fieldSets as $name => $fieldSet) : ?>
<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
<?php endif; ?>
foreach ($fields as $field)
{
$field = is_array($field) ? $field : array($field);
foreach ($field as $f)
<?php
// Include the real fields in this panel.
if ($name == 'vdmmetadata')
{
if ($form->getField($f))
{
if (in_array($f, $hiddenFields))
{
$form->setFieldAttribute($f, 'type', 'hidden');
}
echo $form->renderField($f);
break;
}
echo $form->renderField('metadesc');
echo $form->renderField('metakey');
}
}
foreach ($form->getFieldset($name) as $field)
{
if ($field->name != 'jform[metadata][tags][]')
{
echo $field->renderField();
}
} ?>
<?php endforeach; ?>

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder
@@ -34,7 +34,13 @@ $fields = $displayData->get('fields') ?: array(
'created',
'created_by',
'modified',
'modified_by'
'modified_by',
'published',
'ordering',
'access',
'version',
'hits',
'id'
);
$hiddenFields = $displayData->get('hidden_fields') ?: array();

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder

View File

@@ -10,7 +10,7 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.5.6
@version 2.5.8
@build 12th October, 2017
@created 30th April, 2015
@package Component Builder