Skip to content
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.

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

Add TableColumn Caption definition in model #708

Merged
merged 4 commits into from
May 28, 2019

Conversation

abbadon1334
Copy link
Collaborator

In Model we can define the default caption for the field, usually in Table we use abbreviation or acronim of that long caption, to centralize TableColumn the definition of the ui rappresentation of the field in all table.

In Model we can define the default caption for the field, usually in Table we use abbreviation or acronim of that long caption, to centralize TableColumn the definition of the ui rappresentation of the field in all table.
@codecov
Copy link

codecov bot commented May 14, 2019

Codecov Report

Merging #708 into develop will decrease coverage by 0.12%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop     #708      +/-   ##
=============================================
- Coverage      68.84%   68.72%   -0.13%     
- Complexity      2049     2055       +6     
=============================================
  Files            106      106              
  Lines           4825     4837      +12     
=============================================
+ Hits            3322     3324       +2     
- Misses          1503     1513      +10
Impacted Files Coverage Δ Complexity Δ
src/TableColumn/Generic.php 82.69% <100%> (+0.16%) 37 <0> (+1) ⬆️
src/FormLayout/_Abstract.php 79.16% <0%> (-7.2%) 35% <0%> (+3%)
src/Grid.php 73.41% <0%> (-1.26%) 64% <0%> (+2%)
src/CRUD.php 47.36% <0%> (-0.64%) 54% <0%> (ø)
src/jsModal.php 62.5% <0%> (ø) 7% <0%> (ø) ⬇️
src/FormField/Upload.php 60% <0%> (ø) 35% <0%> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c20cc2d...b2dab5c. Read the comment docs.

@romaninsh
Copy link
Member

Please check my proposal.

@acicovic
Copy link
Collaborator

Hi guys, what's the status of this?

@abbadon1334
Copy link
Collaborator Author

it works and has passed all test, i already said that i can't see the proposal made by @romaninsh

@DarkSide666
Copy link
Member

This looks good, but would like to see @romaninsh proposal.

@acicovic
Copy link
Collaborator

@romaninsh we couldn't find your proposal on this thread or Gitter. Can you post it?

Thanks!

// if $this->caption is empty, header caption will be overriden by linked field definition
if (empty($this->caption)) {
$caption = $f->getCaption();
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if it's not empty? $caption will be undefined?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$caption = empty($this->caption) ? $f->getCaption : $this->caption;

@romaninsh
Copy link
Member

sorry, forgetting to submit the comments 😆 .

@abbadon1334 abbadon1334 merged commit 18ce128 into atk4:develop May 28, 2019
@abbadon1334 abbadon1334 deleted the patch-2 branch May 28, 2019 04:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants