Skip to content

[4.0] Category field notices #26129

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 4 commits into from
Sep 2, 2019
Merged

[4.0] Category field notices #26129

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46df2b5
Fix notices in category edit field
SharkyKZ Sep 2, 2019
97ae6f4
Update doc block
SharkyKZ Sep 2, 2019
fa799d7
Unneeded import
SharkyKZ Sep 2, 2019
2088655
Merge branch '4.0-dev' into j4/CategoryeditField
wilsonge Sep 2, 2019
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/Field/CategoryeditField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ protected function getInput()

$data['options'] = $this->getOptions();
$data['allowCustom'] = $this->allowAdd;
$data['customPrefix'] = $this->customPrefix;
$data['refreshPage'] = (boolean) $this->element['refresh-enabled'];
$data['refreshCatId'] = (string) $this->element['refresh-cat-id'];
$data['refreshSection'] = (string) $this->element['refresh-section'];
Expand Down
5 changes: 3 additions & 2 deletions administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
* @var array $options Options available for this field.
* @var array $inputType Options available for this field.
* @var string $accept File types that are accepted.
* @var string $customPrefix Optional prefix for new categories.
*/

$html = array();
Expand All @@ -72,9 +73,9 @@
{
$attr2 .= ' allow-custom';

if ($this->customPrefix !== '')
if ($customPrefix !== '')
{
$attr2 .= ' data-custom_value_prefix="' . $this->customPrefix . '" ';
$attr2 .= ' new-item-prefix="' . $customPrefix . '" ';
}
}

Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_content/Model/ArticleModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,6 @@ public function save($data)
$data['images'] = (string) $registry;
}

\JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');

// Create new category, if needed.
$createCategory = true;

Expand Down