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

Reference tagging status view #756

Merged
merged 12 commits into from
Jan 10, 2023

Conversation

rabstejnek
Copy link
Collaborator

@rabstejnek rabstejnek commented Dec 14, 2022

Fleshed out the view for tag status (previously referred to as tag history). This view shows consensus tags and all user tags applied to a reference, including those which were resolved. Parts of the conflict resolution template was repurposed to also serve this purpose, so there are also slight style changes on the conflict resolution page.

Conflict resolution view (slight changes)

image

Tag state view

image

Other changes:

  • Generalized some CSS class styles for the conflict resolution page to keep stylesheet bloat down
  • Updated reversion for Reference and ReferenceUserTag to follow tag changes
    • These tags are added as Version models associated with the Reference/ReferenceUserTag Revision; I believe this is the solution that reversion expects since this actually allows you to revert to the previous tagging state, but if we wanted a more lightweight approach maybe an Assessment.Log would be more appropriate (future PR)

@rabstejnek
Copy link
Collaborator Author

@shapiromatron I updated the wording from "tag history" to "tag state", since I believe that is more indicative of what's being shown; I'm open to other suggestions of wording, since it would just be an easy search and replace.

@rabstejnek rabstejnek marked this pull request as ready for review December 15, 2022 20:20
@rabstejnek rabstejnek changed the title WIP: Add view for tag state Add view for tag state Dec 15, 2022
Copy link
Owner

@shapiromatron shapiromatron left a comment

Choose a reason for hiding this comment

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

Nice job! Some minor tweaks requested to the language for state vs history; we can discuss in person if you'd like.

@shapiromatron shapiromatron changed the title Add view for tag state Reference tagging status view Jan 4, 2023
Copy link
Owner

@shapiromatron shapiromatron left a comment

Choose a reason for hiding this comment

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

Looks good! I made two minor, substantive changes: a) renamed "tag state" to "tag status", and b) for the tag status page, we should all user_tags, regardless of if they've been resolved or not. It's just available for the historical record.

@shapiromatron shapiromatron merged commit cce14b6 into literature-conflict-resolution Jan 10, 2023
@shapiromatron shapiromatron deleted the tag-history branch January 10, 2023 17:04
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.

2 participants