Fix HasOneSql::addField() implicit caption #1239
Merged
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
mvorisek
commented
Jan 11, 2025
src/Reference/HasOneSql.php
Outdated
| { | ||
| $ourModel = $this->getOurModel(); | ||
|
|
||
| return preg_replace('~_(' . preg_quote($ourModel->idField, '~') . '|id)$~', '', $this->link); |
mvorisek
commented
Jan 12, 2025
| $analysingTheirField = $analysingTheirModel->getField($theirFieldName); | ||
| $defaults['type'] ??= $analysingTheirField->type; | ||
| $defaults['enum'] ??= $analysingTheirField->enum; | ||
| $defaults['values'] ??= $analysingTheirField->values; | ||
| $defaults['caption'] ??= $analysingTheirField->caption; | ||
| $defaults['caption'] ??= $this->getOurFieldCaptionWithoutReferenceSuffix($analysingTheirModel) . ' ' . $analysingTheirField->getCaption(); |
There was a problem hiding this comment.
example usecase: https://dev.agiletoolkit.org/demos/interactive/cardtable.php
before:
after:
also: https://dev.agiletoolkit.org/demos/collection/crud.php
before:
after:
mvorisek
changed the title
mvorisek
force-pushed
the
improve_hasonesql_caption
branch
from
b135c12 to
9cd1437
Compare
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.
No description provided.