-
Notifications
You must be signed in to change notification settings - Fork 16
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 tag deletion/addition filters for conflict resolution page #919
Conversation
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 django.db import migrations, models | ||
|
||
|
||
def add_deletions(apps, schema_editor): |
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.
this was a joy to read; nice job.
@@ -188,6 +214,52 @@ def filter_anything_tagged_me(self, queryset, name, value): | |||
).filter(my_tag_count__gt=0) | |||
return queryset.distinct() | |||
|
|||
def filter_tag_additions(self, queryset, name, value): |
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.
These methods look good, but they could be slow. I don't think we need to change anything now.
We may need to monitor performance with some real data after its in the wild for a while to determine if we need to optimize. I'm thinking specifically of a case where we include descendants, and the parent has many children. I wonder if there's a way to see to see if a reference has any of these tags in a single query.
I think you could do it it with the ArrayField using overlap, but that's only for the deletions, not the additions.
Adds additional filtering to conflict resolution page.
deleted_tags
field to UserReferenceTag modelShow tag deletions on Tag Status page
Show text for empty UserReferenceTag case
![image](https://private-user-images.githubusercontent.com/42587248/273314643-94330cf4-2a4a-4e6a-9086-b36c9dca53fc.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzMzU3NjgsIm5iZiI6MTczOTMzNTQ2OCwicGF0aCI6Ii80MjU4NzI0OC8yNzMzMTQ2NDMtOTQzMzBjZjQtMmE0YS00ZTZhLTkwODYtYjM2YzlkY2E1M2ZjLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDA0NDQyOFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTk0OWNmNmU1ZWU5YTFkODFlOTkyMDllYWJiNDJmYTg4MzZkN2ZlMGMxYzhkOGJhNWRmMjE0ZWZlYzgxMDM2NjUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.B0-EA_IUlG5zCPMjk-SIoqcvOotONYK1zTwu6HV51aM)
Change empty conflict resolution list message from success ("Conflict resolution complete") to "No conflicts found"
![image](https://private-user-images.githubusercontent.com/42587248/273927660-f16af55c-d12c-48e6-a22b-5cd284fc4b13.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkzMzU3NjgsIm5iZiI6MTczOTMzNTQ2OCwicGF0aCI6Ii80MjU4NzI0OC8yNzM5Mjc2NjAtZjE2YWY1NWMtZDEyYy00OGU2LWEyMmItNWNkMjg0ZmM0YjEzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEyVDA0NDQyOFomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTFhZTFjMWViODlmZTJmYzQ4N2ZmMzQ4ZmNmZGE4ZWM1ZGM3MTI0YzhiZmJlNGJmMDFmODUwZTg4Njk0NmE2MjImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.JbuW00VpG0Q0PUlmNj_ldB-YjDL-XBNGIa-ZwPJc1Lc)