Fix common db relation insertion #439
Open
+5
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lainow
force-pushed
the
fix-commondbrelation-injection
branch
from
b8d0174 to
9c5735f
Compare
Lainow
requested review from
stonebuzz and
Rom1-B
and removed request for
stonebuzz
Rom1-B
requested changes
Nov 27, 2024
stonebuzz
requested changes
Nov 28, 2024
| @@ -1606,7 +1606,7 @@ private function effectiveAddOrUpdate($injectionClass, $item, $values, $add = tr | |||
| //CommonDBRelation are managed separately, so related field should be ignored | |||
| // Ex : User -> groups_id -> Group_User | |||
| // groups_id should not be injected in User (field contains group name (string)) | |||
| if ($option !== false && isset($option['displaytype']) && $option['displaytype'] == 'relation') { | |||
| if ($option !== false && isset($option['displaytype']) && $option['displaytype'] == 'relation' && !($item instanceof CommonDBRelation)) { | |||
There was a problem hiding this comment.
I'm not sure about the fix, with this example (inject groups_id from User object)
User -> groups_id (from Group_User)
The condition will return false (to delegate to specific case) -> OK
But with this
User -> name
The condition will return false -> KO
Because User is not an instance of CommonDBRelation
Suggested change
| if ($option !== false && isset($option['displaytype']) && $option['displaytype'] == 'relation' && !($item instanceof CommonDBRelation)) { | |
| if (($option !== false && isset($option['displaytype']) && $option['displaytype'] == 'relation') || !($item instanceof CommonDBRelation)) { |
There was a problem hiding this comment.
With the || operator, the plugin doesn't insert any data, whereas with &&, all data is actually inserted.
There was a problem hiding this comment.
And I tested with a user like you said but everything works perfectly.
|
It looks OK, can you get the customer to validate it? |
2 tasks
|
Reminder (adapt CHANGELOG.md) |
Lainow
force-pushed
the
fix-commondbrelation-injection
branch
from
9153c87 to
8acb323
Compare
stonebuzz
requested changes
Dec 11, 2024
Co-authored-by: Stanislas <[email protected]>
|
can you rebase (customer is OK with this change?) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist before requesting a review
Please delete options that are not relevant.
Description
Fixed an error when inserting data linked to a relationship table (for example, the supplier identifier was removed from the list because the type was relationship).
Screenshots (if appropriate):