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
Closes: #9583 - Add column specific search field to tables #15073
Open
DanSheps
wants to merge
28
commits into
feature
Choose a base branch
from
9583-add_column_specific_search_field_to_tables
base: feature
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
4c39516
Preliminary work on 9583.
DanSheps e762755
HTMX work on 9583.
DanSheps f7294f7
Preliminary work on 9583.
DanSheps 664a0eb
Preliminary work on 9583.
DanSheps cc423f5
Apply some quick fixes and add comments
DanSheps 50557c0
Final work on #9583 for basic functionality
DanSheps 03f67f3
CSS update for dropdown
DanSheps 3243ebd
Merge remote-tracking branch 'origin/9583-add_column_specific_search_…
DanSheps b54cfd6
Update CSS
DanSheps 5f69666
Change dropdown position and fix test failure
DanSheps 06c1aff
Fix test failure
DanSheps 4ae6683
Merge in recent feture changes
DanSheps c3f1a96
Update CSS after merge
DanSheps f81f76f
Optimizations
DanSheps 0309796
Fix extraneous __all__ entry
DanSheps 84151cb
Fix tom-select errors related to field id. Break out render_field fu…
DanSheps 77bfd62
Merge branch 'feature' into 9583-add_column_specific_search_field_to_…
jeremystretch 25a4e94
Merge branch 'feature' into 9583-add_column_specific_search_field_to_…
jeremystretch f257f4a
Apply suggestions from code review
DanSheps 8a7df0b
Update netbox/utilities/templatetags/form_helpers.py
DanSheps a422a3c
Modify logic for table column filtering to further isolate the column…
DanSheps 8ad79a6
Update CSS
DanSheps a9aa0cb
Merge in latest feature
DanSheps 35cff12
Apply suggestions from Arthur
DanSheps 1c995fa
Perform OOB swap for filter badges
DanSheps 479c69b
Fix up duplication of template chits when rendering HTMX
DanSheps 5830ae9
Rename variable for doing OOB swaps on the table
DanSheps fd38255
Rename swap variable back and remove join
DanSheps File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{% load helpers %} | ||
|
||
<div id="applied_filters_pane" hx-swap-oob="true"> | ||
{# Applied filters #} | ||
{% if filter_form %} | ||
{% applied_filters model filter_form request.GET %} | ||
{% endif %} | ||
</div> |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{% load form_helpers %} | ||
{% if form_field %} | ||
<div class="column-filter dropdown"> | ||
<a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside"><i class="mdi mdi-filter-settings"></i></a> | ||
<div class="dropdown-menu"> | ||
<div class="px-3 py-3"> | ||
{% render_table_filter_field form_field table=table request=request %} | ||
</div> | ||
</div> | ||
</div> | ||
{% endif %} |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed full path, as this will allow taking into account filters on the form (to facilitate pushing of the filters from the column as well).
Should not impact functionality
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we know this for sure? IIRC we specify the full path for a reason, I just can't recall why.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From my testing, I haven't found any issues with it.