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

Fix/fragment ordering tc2 #384

Merged
merged 14 commits into from
Apr 25, 2023
Merged

Conversation

tcouch
Copy link
Collaborator

@tcouch tcouch commented Apr 24, 2023

Changes include:

  • Revert to putting Testimonia without works at top of Antiquarian page
  • Remove unknown work from names
  • Fix reordering testimonia and apposita on work detail pages
  • Fix reindexing following book move
  • Some tests reinstated
  • Handle book deletion

@tcouch tcouch requested a review from acholyn April 24, 2023 20:49
@tcouch
Copy link
Collaborator Author

tcouch commented Apr 24, 2023

@acholyn Sorry I just realised having running pre-commit and updated loads of files makes it really hard to see what's changed. Mostly models.base, models.antiquarians, models.work, and the migration file.

@@ -773,9 +773,6 @@ def test_testimonium_queryset_methods(self):
self.assertEqual(0, self.testimonium.definite_antiquarian_links().count())
self.assertEqual(1, self.testimonium.possible_antiquarian_links().count())

@pytest.mark.skip(
"This can be revisited when definite status is broken down into ant/wk/bk"
)
def test_add_antiquarian_fragment_ignores_work(self):
Copy link
Collaborator

Choose a reason for hiding this comment

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

does this test pass for you then?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, but I had to fix a few things to do with testimonium ordering: basically put testimonia belonging to unknown works before those attached to other works (opposite to how it works for fragments and apposita)

Copy link
Collaborator

@acholyn acholyn 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, thank you!

@tcouch tcouch merged commit b006420 into fix/fragment-ordering Apr 25, 2023
@tcouch tcouch deleted the fix/fragment-ordering-tc2 branch April 25, 2023 09:31
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.

None yet

2 participants