Add Tenant Group column to tables #9686 #9695
Merged
Conversation
This file contains hidden or 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
Works the same as the existing TenantColumn, but displats the Tenant Group of the Tenant. Views should prefetch the Tenants Group for this to be efficient in large tables.
A mixin to add the Tenant and Tenant Group columns to a table.
Replaces all usages of the TenantColumn with the new TenancyColumnsMixin. This enables the user to add a column for Tenant Group on all tables which also has a column for Tenant.
Configure the prefetch to also include the Tenant Group, avoids additional database queries when the Tenant Group column is to be rendered. NOTE: If no personalisation of the global search tables should be done, this commit can be reverted.
Removes the Tenant Group column from tables which aren't configurable by the user.
Prefetch the Tenant Group in views which allows its table to be configured by the user. This decreases the amount of database queries that are required to fetch the data.
| Include the tenant group description. | ||
| """ | ||
| template_code = """ | ||
| {% if record.tenant and record.tenant.group %} |
Member
There was a problem hiding this comment.
This is where we need to be careful with regard to prefetching. Because the column itself doesn't define an accessor, the tenant group doesn't get prefetched in the queryset. Instead, a separate query is made for tenant.group as needed for each unique tenant. I think we can resolve this by specifying tenant__group as the accessor for the column and tweaking the template code, but I'll merge this as-is and try a few things.
Member
|
Thanks for taking this! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Fixes: #9686
Add a column to display Tenant Group on tables which already displays the Tenant.