Repository navigation
Conversation
This file contains hidden or 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
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.
Forward port of #1335
Checklist before requesting a review
Description
When a Data Injection model maps a column to an additional field (e.g.
Entity - My block), saving the mapping makes the model inaccessible: it disappears from the models list and opening it shows:The injection itself would fail for the same reason.
Since #1299,
PluginFieldsAbstractContainerInstance::canCreate()/canUpdate()always returnfalse. The generated...Injectionclass inherits them. Data Injection (2.15.12) now checkscanCreate()/canUpdate()on every itemtype mapped in a model (PluginDatainjectionModel::checkRightOnModel()) and before writing, so any model using an additional field is rejected.Fix
The generated injection class (
templates/injection.class.tpl) overridescanCreate()/canUpdate()with the same rules as the item form:PluginFieldsProfile);CommonDBChild.The container instance classes keep denying any direct write, so #1299 is not weakened. Generated files are regenerated on plugin update.
Tests
ContainerItemRightTest::testInjectionClassFollowsParentItemtypeUpdateRight: rights are granted to an admin, denied when the container is read-only for the profile, and denied to apost-onlyuser. The Data Injection interface is stubbed (tests/fixtures/datainjection_stubs.php) when the plugin is absent, so the test always runs.