Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 15, 2021

Both the functional and technical name of the ir.rule model is "Record
Rule". This commit makes sure that all occurrences of "Access Rule" are
replaced by the correct name "Record Rule" as it was easily confused
with "Access Rights".

Original PR: #1118

Forward-Port-Of: #1421

@robodoo
Copy link
Collaborator

robodoo commented Dec 15, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 15, 2021

Ping @AntoineVDV, @Feyensv cherrypicking of pull request #1421 failed.

stderr:

14:11:49.103565 git.c:344               trace: built-in: git cherry-pick ecff58e01527e2e76b8a78ab9a894d2dfac5de43
error: could not apply ecff58e0... [IMP] developer/*: replace occurrences of "access rule" by "record rule"
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

Both the functional and technical name of the `ir.rule` model is "Record
Rule". This commit makes sure that all occurrences of "Access Rule" are
replaced by the correct name "Record Rule" as it was easily confused
with "Access Rights".

Original PR: #1118

X-original-commit: 46cb0b8
@AntoineVDV AntoineVDV force-pushed the 15.0-14.0-rename_access_rules_to_record_rules-anv-NIcI-fw branch from 7ad755b to 253748e Compare December 16, 2021 09:11
@AntoineVDV
Copy link
Collaborator

@robodoo r+

@C3POdoo C3POdoo requested a review from a team December 16, 2021 09:12
@robodoo robodoo closed this in a692dbd Dec 16, 2021
@robodoo robodoo temporarily deployed to merge December 16, 2021 09:19 Inactive
@fw-bot fw-bot deleted the 15.0-14.0-rename_access_rules_to_record_rules-anv-NIcI-fw branch December 30, 2021 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants