FIX Add one to current colspan in fixColumns instead of resetting to 2 #1869
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
Kevinn1109
force-pushed
the
bugfix/no-records-row-colspan
branch
3 times, most recently
from
ee22a35 to
ae3f7db
Compare
GuySartorelli
requested changes
Dec 16, 2024
client/src/legacy/GridField.js
Outdated
| @@ -176,7 +176,8 @@ $.entwine('ss', function($) { | |||
| this.find('.sortable-header').append('<th class="main col-Actions" />'); | |||
| this.find('tbody tr').each(function () { | |||
| var cell = $(this).find('td:last'); | |||
| cell.attr('colspan', 2); | |||
| var colspan = cell.attr("colspan") ?? 1; | |||
There was a problem hiding this comment.
Suggested change
| var colspan = cell.attr("colspan") ?? 1; | |
| var colspan = cell.attr('colspan') ?? 1; |
What is the ?? 1 there for? What scenarios result in there not being a colspan attribute?
There was a problem hiding this comment.
The colspan attribute is not set by default, I've not seen it in use other than in the case of an empty gridfield.
There was a problem hiding this comment.
Would colspan 2 always be correct when colspan wasn't already defined?
2 tasks
Kevinn1109
force-pushed
the
bugfix/no-records-row-colspan
branch
from
ae3f7db to
8d14019
Compare
GuySartorelli
requested changes
Dec 16, 2024
| @@ -176,7 +177,8 @@ $.entwine('ss', function($) { | |||
| this.find('.sortable-header').append('<th class="main col-Actions" />'); | |||
| this.find('tbody tr').each(function () { | |||
| var cell = $(this).find('td:last'); | |||
| cell.attr('colspan', 2); | |||
| var colspan = cell.attr('colspan') ?? 1; | |||
There was a problem hiding this comment.
Suggested change
| var colspan = cell.attr('colspan') ?? 1; | |
| // Note we need to add 1 to the current column span, because we're going to add a new column | |
| var colspan = cell.attr('colspan') ?? 1; |
client/src/legacy/GridField.js
Outdated
| @@ -176,7 +176,8 @@ $.entwine('ss', function($) { | |||
| this.find('.sortable-header').append('<th class="main col-Actions" />'); | |||
| this.find('tbody tr').each(function () { | |||
| var cell = $(this).find('td:last'); | |||
| cell.attr('colspan', 2); | |||
| var colspan = cell.attr("colspan") ?? 1; | |||
There was a problem hiding this comment.
Would colspan 2 always be correct when colspan wasn't already defined?
In the previous situation, the 'No items found' row would be hardcapped at colspan=2. This change ensures that that row always spans all columns in the table
Kevinn1109
force-pushed
the
bugfix/no-records-row-colspan
branch
from
8d14019 to
3d6b2d9
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.
Description
In the old situation, the final column in each row would be hardcoded to colspan="2" if the function 'fixColumns' was called. This is required because this function adds an additional column to the table that needs to be filled in. This change removes the hardcoded number and instead adds one to the current colspan of the last cell. This fixes the bug that the 'No items found' row would be capped at two columns even if the table has more.
Manual testing steps
Issues
Pull request checklist