Skip to content

Restore support for rendering custom fieldsets when using JLayout 'joomla.edit.params' #4284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 31 commits into from
Closed

Restore support for rendering custom fieldsets when using JLayout 'joomla.edit.params' #4284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
67fa8f7
Makes URL in two-factor authentication message a real hyperlink
betweenbrain Oct 4, 2013
2ea0317
Merge branch 'two-factor-message-anchor' into upstream-staging
betweenbrain Mar 28, 2014
f3836e8
Merge remote-tracking branch 'upstream/staging' into upstream-staging
betweenbrain May 16, 2014
9941c16
Merge remote-tracking branch 'upstream/staging' into upstream-staging
betweenbrain Jul 30, 2014
3518c91
Merge remote-tracking branch 'upstream/staging' into upstream-staging
betweenbrain Jul 30, 2014
9ddc6f0
Merge remote-tracking branch 'upstream/staging' into upstream-staging
betweenbrain Aug 5, 2014
7fb7e12
Merge remote-tracking branch 'upstream/staging' into upstream-staging
betweenbrain Sep 16, 2014
39fe50e
Code style
betweenbrain Sep 16, 2014
79d20b5
Retrieve all fieldsets instead of params and attribs only
betweenbrain Sep 16, 2014
95fbe25
Define ignore_fieldsets consistently
betweenbrain Sep 16, 2014
fc51871
Add ignore_fieldsets
betweenbrain Sep 16, 2014
3d44109
Code style
betweenbrain Sep 16, 2014
3c98e50
Further implementation of ignore_fieldsets
betweenbrain Sep 16, 2014
8892949
Revert "Makes URL in two-factor authentication message a real hyperlink"
betweenbrain Sep 16, 2014
febf5ed
Merge branch 'upstream-staging' into restore-custom-fieldsets
betweenbrain Sep 16, 2014
bcc893f
Sync language file with upstream
betweenbrain Sep 16, 2014
210c7b1
Merge branch 'upstream-staging' into restore-custom-fieldsets
betweenbrain Sep 16, 2014
696891f
Restore options tabs in com_content
betweenbrain Sep 16, 2014
a7fe7e1
Update modal.php with related changes to restore support for renderin…
betweenbrain Sep 17, 2014
2a66fcd
Update modal.php with related changes to restore support for renderin…
betweenbrain Sep 17, 2014
957073d
Don't render component metadata form
betweenbrain Oct 16, 2014
975bca9
Don't render images and metadata forms as tabs
betweenbrain Oct 16, 2014
a9f8dc7
Merge remote-tracking branch 'upstream/staging' into upstream-staging
betweenbrain Oct 16, 2014
2873936
Merge branch 'upstream-staging' into restore-custom-fieldsets
betweenbrain Oct 16, 2014
8244f74
Tabs "form" and "display" missing, but tab "metadata" added.
betweenbrain Oct 17, 2014
371fcd5
Tab "filter timeline" missing
betweenbrain Oct 17, 2014
f5eeb27
Restore Link Type, Page Display and Metadata tabs
betweenbrain Oct 17, 2014
dcc628d
Hide metadata tab
betweenbrain Oct 17, 2014
54473a0
Hide metadata tab
betweenbrain Oct 17, 2014
8d95b37
Tab "associations" duplicated.
betweenbrain Oct 17, 2014
424ab76
Tab "associations" duplicated.
betweenbrain Oct 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions administrator/components/com_categories/views/category/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<?php echo JHtml::_('bootstrap.endTab'); ?>
<?php endif; ?>

<?php $this->ignore_fieldsets = array('jmetadata'); ?>
<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>

<?php echo JHtml::_('bootstrap.endTabSet'); ?>
Expand Down
3 changes: 3 additions & 0 deletions administrator/components/com_contact/views/contact/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select');

// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
$this->ignore_fieldsets = array('details', 'item_associations', 'jmetadata');

$app = JFactory::getApplication();
$assoc = JLanguageAssociations::isEnabled();
?>
Expand Down
3 changes: 3 additions & 0 deletions administrator/components/com_contact/views/contact/tmpl/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select');

// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
$this->ignore_fieldsets = array('details', 'display', 'email');

$app = JFactory::getApplication();

$input = $app->input;
Expand Down
7 changes: 3 additions & 4 deletions administrator/components/com_content/views/article/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
JHtml::_('behavior.keepalive');
JHtml::_('formbehavior.chosen', 'select');

$this->hiddenFieldsets = array();
$this->hiddenFieldsets[0] = 'basic-limited';
$this->configFieldsets = array();
$this->configFieldsets[0] = 'editorConfig';
$this->configFieldsets = array('editorConfig');
$this->hiddenFieldsets = array('basic-limited');
$this->ignore_fieldsets = array('jmetadata');

// Create shortcut to parameters.
$params = $this->state->get('params');
Expand Down
7 changes: 3 additions & 4 deletions administrator/components/com_content/views/article/tmpl/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
JHtml::_('behavior.keepalive');
JHtml::_('formbehavior.chosen', 'select');

$this->hiddenFieldsets = array();
$this->hiddenFieldsets[0] = 'basic-limited';
$this->configFieldsets = array();
$this->configFieldsets[0] = 'editorConfig';
$this->configFieldsets = array('editorConfig');
$this->hiddenFieldsets = array('basic-limited');
$this->ignore_fieldsets = array('jmetadata');

// Create shortcut to parameters.
$params = $this->state->get('params');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/views/item/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@

<?php
$this->fieldsets = array();
$this->ignore_fieldsets = array('aliasoptions', 'request');
$this->ignore_fieldsets = array('item_associations');
echo JLayoutHelper::render('joomla.edit.params', $this);
?>

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<?php echo $this->loadTemplate('display'); ?>
<?php echo JHtml::_('bootstrap.endTab'); ?>

<?php $this->set('ignore_fieldsets', array('jbasic')); ?>
<?php $this->ignore_fieldsets = array('images', 'jbasic', 'jmetadata'); ?>
<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>


Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<?php echo $this->loadTemplate('display'); ?>
<?php echo JHtml::_('bootstrap.endTab'); ?>

<?php $this->set('ignore_fieldsets', array('jbasic')); ?>
<?php $this->ignore_fieldsets = array('jbasic'); ?>
<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>

<?php if ($assoc) : ?>
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_tags/views/tag/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
</div>
<?php echo JHtml::_('bootstrap.endTab'); ?>

<?php $this->ignore_fieldsets = array('jmetadata'); ?>
<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>

</div>
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_weblinks/views/weblink/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
JHtml::_('behavior.formvalidation');
JHtml::_('formbehavior.chosen', 'select');

// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
$this->ignore_fieldsets = array('images', 'jmetadata');
?>
<script type="text/javascript">
Joomla.submitbutton = function(task)
Expand Down
29 changes: 12 additions & 17 deletions layouts/joomla/edit/params.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,29 @@

defined('_JEXEC') or die;

$app = JFactory::getApplication();
$form = $displayData->getForm();

$fieldSets = $form->getFieldsets('params');

// For BC with versions < 3.2 we need to render the attribs too
$attribsFieldSet = $form->getFieldsets('attribs');

$fieldSets = array_merge($fieldSets, $attribsFieldSet);
$app = JFactory::getApplication();
$form = $displayData->getForm();
$fieldSets = $form->getFieldsets();

if (empty($fieldSets))
{
return;
}

$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: array();
$ignoreFields = $displayData->get('ignore_fields') ?: array();
$extraFields = $displayData->get('extra_fields') ?: array();
$ignoreFieldsets = $displayData->get('ignore_fieldsets') ? : array();
$ignoreFields = $displayData->get('ignore_fields') ? : array();
$extraFields = $displayData->get('extra_fields') ? : array();

if (!empty($displayData->hiddenFieldsets))
{
// These are required to preserve data on save when fields are not displayed.
$hiddenFieldsets = $displayData->hiddenFieldsets ?: array();
$hiddenFieldsets = $displayData->hiddenFieldsets ? : array();
}

if (!empty($displayData->configFieldsets))
{
// These are required to configure showing and hiding fields in the editor.
$configFieldsets = $displayData->configFieldsets ?: array();
$configFieldsets = $displayData->configFieldsets ? : array();
}

if ($displayData->get('show_options', 1))
Expand All @@ -46,8 +40,9 @@
{
// Ensure any fieldsets we don't want to show are skipped (including repeating formfield fieldsets)
if (in_array($name, $ignoreFieldsets) || (!empty($configFieldsets) && in_array($name, $configFieldsets))
|| !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets)
|| (isset($fieldSet->repeat) && $fieldSet->repeat == true))
|| !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets)
|| (isset($fieldSet->repeat) && $fieldSet->repeat == true)
)
{
continue;
}
Expand Down Expand Up @@ -81,7 +76,7 @@
}
else
{
$html = array();
$html = array();
$html[] = '<div style="display:none;">';
foreach ($fieldSets as $name => $fieldSet)
{
Expand Down