Skip to content

[5.3] Customfields: Also look at context when checking uniqueness #44161

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
laoneo merged 3 commits into from
Oct 10, 2024
Merged

[5.3] Customfields: Also look at context when checking uniqueness #44161

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
58ccfe1
Customfields: Also look at context when checking uniqueness
Hackwar Sep 29, 2024
070c18c
Update com_fields.ini
Hackwar Oct 10, 2024
e46a951
Merge branch '5.3-dev' into 5.3-customfields-alias
QuyTon Oct 10, 2024
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
2 changes: 1 addition & 1 deletion administrator/components/com_fields/src/Table/FieldTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function check()
// Verify that the name is unique
$table = new self($this->_db, $this->getDispatcher());

if ($table->load(['name' => $this->name]) && ($table->id != $this->id || $this->id == 0)) {
if ($table->load(['name' => $this->name, 'context' => $this->context]) && ($table->id != $this->id || $this->id == 0)) {
$this->setError(Text::_('COM_FIELDS_ERROR_UNIQUE_NAME'));

return false;
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/com_fields.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COM_FIELDS="Fields"
COM_FIELDS_BATCH_GROUP_LABEL="To Move or Copy your selection please select a group."
COM_FIELDS_BATCH_GROUP_OPTION_NONE="- No Group -"
COM_FIELDS_CHOOSE_CONTEXT_LABEL="Context"
COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item or it may be already present as a custom field in another extension)."
COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item)."
COM_FIELDS_FIELD_CLASS_DESC="The class attributes of the field in the edit form. If multiple classes are needed, list them with spaces."
COM_FIELDS_FIELD_CLASS_LABEL="Field Class"
COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL="Default Value"
Expand Down