Skip to content

Implement component params for fieldgroups #17317

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

Merged
merged 3 commits into from
Jul 29, 2017
Merged

Implement component params for fieldgroups #17317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a106712
implement component params for fieldgroup
rdeutz Jul 28, 2017
9f02520
changing the installation sql to add the params field
rdeutz Jul 28, 2017
298ffab
rename files and add a newline at the end of the file
rdeutz Jul 28, 2017
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_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE `#__fields_groups` ADD `params` TEXT NOT NULL AFTER `ordering`;
1 change: 1 addition & 0 deletions administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "#__fields_groups" ADD "params" TEXT NOT NULL ;
1 change: 1 addition & 0 deletions administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE [#__fields_groups] ADD [params] [text] NOT NULL DEFAULT '';
26 changes: 25 additions & 1 deletion administrator/components/com_fields/models/group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,34 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')

$parts = FieldsHelper::extract($this->state->get('filter.context'));

// Extract the component name
$component = $parts[0];

// Extract the optional section name
$section = (count($parts) > 1) ? $parts[1] : null;

if ($parts)
{
// Set the access control rules field component value.
$form->setFieldAttribute('rules', 'component', $parts[0]);
$form->setFieldAttribute('rules', 'component', $component);
}

if ($section !== null)
{
// Looking first in the component models/forms folder
$path = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');

if (file_exists($path))
{
$lang = JFactory::getLanguage();
$lang->load($component, JPATH_BASE, null, false, true);
$lang->load($component, JPATH_BASE . '/components/' . $component, null, false, true);

if (!$form->loadFile($path, false))
{
throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions installation/sql/mysql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,7 @@ CREATE TABLE IF NOT EXISTS `#__fields_groups` (
`checked_out` int(11) NOT NULL DEFAULT '0',
`checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`ordering` int(11) NOT NULL DEFAULT '0',
`params` text NOT NULL,
`language` char(7) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`created_by` int(10) unsigned NOT NULL DEFAULT '0',
Expand Down
1 change: 1 addition & 0 deletions installation/sql/postgresql/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ CREATE TABLE "#__fields_groups" (
"checked_out" integer DEFAULT '0' NOT NULL,
"checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"ordering" integer DEFAULT '0' NOT NULL,
"params" text DEFAULT '' NOT NULL,
"language" varchar(7) DEFAULT '' NOT NULL,
"created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
"created_by" bigint DEFAULT '0' NOT NULL,
Expand Down
1 change: 1 addition & 0 deletions installation/sql/sqlazure/joomla.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,7 @@ CREATE TABLE "#__fields_groups" (
"checked_out" bigint NOT NULL DEFAULT 0,
"checked_out_time" datetime2(0) NOT NULL DEFAULT '1900-01-01 00:00:00',
"ordering" int NOT NULL DEFAULT 0,
"params" nvarchar(max) NOT NULL DEFAULT '',
"language" nvarchar(7) NOT NULL DEFAULT '',
"created" datetime2(0) NOT NULL DEFAULT '1900-01-01 00:00:00',
"created_by" bigint NOT NULL DEFAULT 0,
Expand Down