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

Merge staging into production - 2022-12-14 edition #474

Merged
merged 189 commits into from Feb 10, 2023
Merged

Conversation

jacobdgm
Copy link
Contributor

@jacobdgm jacobdgm commented Dec 14, 2022

It's time, soon, to update our production server with the new features and bug fixes, which have been in testing for a little while on staging.

The following changes are included in this merge:

  • base.html (i.e. all pages)
    • header dropdowns are now opaque (commit)
    • replace facebook widget with link to facebook page (commit)
    • improve formatting in the footer, so vertical spacing between sections is standardized (commit)
    • make sure pages print nicely, by adding CSS rules to hide header, footer and sidebar when printing (commit, commit, commit, commit)
  • Article Detail page
    • add search bar to top of page (commit)
  • Article List page
    • add search bar to top of page (commit)
  • Chant Create page
    • refactor test_func checking whether user has permission to modify chants in a given source (commit)
  • Chants by Cantus ID page
    • improve formatting by removing bold styling from volpiano (commit)
    • add title (i.e. mouseover) attributes to cells (commit, commit, commit)
    • add title/mouseover attributes to column headers (commit)
    • display short form of office, rather than full description (commit)
  • Chant Detail page
    • add links to office detail page and genre detail page (commit)
    • make volpiano / melody-and-text easier to read by increasing font sizes (commit)
    • fix logic that checks whether chant has a corresponding gregorien.info page (commit)
    • ensure that even if a chant's c_sequence is 0, it is displayed (commit)
    • tweak formatting, ensuring that "Sequence" doesn't end up far away from "Folio" when the window is wide (commit)
    • ensure view-edit toggle only appears when a user has permission to edit the chant (previously, it would be shown to any logged-in user) (commit, commit)
    • clean up view-edit toggle so it cleanly matches the one shown on the Chant Edit page (commit)
    • add mouseover/title attributes to office and genre (commit)
    • add mouseover/title attributes to column headers in concordances table (commit)
  • Chant Edit Syllabification page
    • refactor test_func checking whether user has permission to modify chants in a given source (commit)
  • Chant Edit page
    • make std_spelling, folio and c_sequence fields required (commit)
    • add red asterisks indicating required fields (commit, commit)
  • Chant List page
    • add links to office detail page and genre detail page (commit)
    • ensure that even if a chant's c_sequence is 0, 0 is displayed in the "Sequence" column (commit)
    • add title/mouseover attributes to offices and genres (commit)
    • add title/mouseover attributes to column headers (commit)
  • Chant Proofread page
    • replace the view/edit toggle with a link to view the chant detail page (commit)
    • ensure links in the sidebar link to other Proofread pages, not to chant edit pages (commit)
    • ensure folio and c_sequence fields are required (commit)
    • make sure office and genre are ModelChoiceFields, rather than text input widgets (commit)
    • add red asterisks to indicate required fields (commit)
  • Chant Search page
    • remove several column headers to make the table narrower (commit) - but this was then undone when implementing order-by-clicking-on-column-header
    • add links to feast, office, genre detail pages (commit)
    • add title (i.e. mouseover) attributes to several column headers (commit), then move some of them from column headers to the cells in the table rows (commit)
    • allow search results to be sorted by various fields by clicking on column headers (commit, commit, commit, commit)
    • make sure pagination indication is properly pluralized (commit)
    • add link to search for keyword on Cantus Index (commit, commit)
    • add title/mouseover attributes to column headers, to offices and genres (commit, commit)
  • Chant Search Manuscript page
    • implement sorting of search results similar to Chant Search page (commit)
  • Contact page
  • CSV export
    • remove cao_concordances column from CSV (commit)
  • Feast Detail page
    • in table of most frequent chants, add title/mouseover attribute to genre (commit)
  • Full Index page
    • display the siglum of each chant's source, rather than the chant's siglum (sometimes chants' sigla are out-of-date) (commit)
    • ensure chants are ordered by folio and then by c_sequence (olim sequence_number) (or in the case of sequences, folio then s_sequence (olim sequence) (commit)
    • add title/mousover attributes to column headings (commit)
    • add title/mousover attributes to offices and genres (commit)
    • ensure s_sequence is displayed in the "Seq" column when there is no c_sequence (commit)
  • Genre Detail page
    • remove unnecessary column (commit)
  • Indexer List page
    • ensure the "N sources" link goes directly to the list-of-sources part of the User Detail page (commit)
  • Sequence Detail page
    • add title/mousover attribute to genre (commit)
  • Source Create page
    • make Siglum field required (commit)
    • mark required fields with red asterisks (commit)
  • Source Edit page
  • Source List page
    • add links to Century Detail and Provenance Detail pages (commit)
  • Source Edit Chants page
    • refactor test_func checking whether user has permission to modify chants in the source (commit)
  • User Detail page
    • add list of sources user is associated with, and ensure that only published sources are displayed in this list (commit, commit, commit)
  • BaseChant model
    • replace sequence_number field with c_sequence, and replace sequence with s_sequence (lots of commits)
  • Chant model
    • make .get_next_chant() more robust, accounting for more edge cases (commit, commit, commit)
  • tests

The above pages have been interacted with on the following devices/browsers:

  • Mac: Safari
  • Mac: Firefox
  • Mac: Chrome
  • Windows: Edge
  • Tiny android tablet: Chrome
  • iPad: Safari

dependabot bot and others added 30 commits July 6, 2022 21:39
Bumps [lxml](https://github.com/lxml/lxml) from 4.8.0 to 4.9.1.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-4.8.0...lxml-4.9.1)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
remove genre column from genre-detail page
Make dropdown menus in header opaque
Add lists of sources to user detail page
on chant detail page, increase volpiano font size
fix logic to check whether gregorien.info page is valid
Ensure unpublished sources do not appear in user detail sources list
Filter sources by published status in view instead of in template
…ecessary code for rendering the new contact page
Merge my staging into DDMAL's staging, to hopefully resolve merge conflicts
Required fields on chant create/edit/proofread pages
Add title attributes in useful places, fix Chant-by-Cantus-ID page formatting
Merge develop into staging - 2023-01-09 edition
@jacobdgm
Copy link
Contributor Author

jacobdgm commented Jan 9, 2023

we need to fix #494 before we merge this

EDIT: fixed!

full-index page: ensure `s_sequence` is displayed if chant/sequence has no `c_sequence`
Merge develop into staging - 2023/01/10 edition
@jacobdgm
Copy link
Contributor Author

On staging, I'm still seeing column headers on the Chant Search and Chant Search Manuscript pages, which confuses me... http://206.12.88.113/chant-search-ms/699578?op=contains&keyword=est&office=&genre=&cantus_id=&mode=&feast=&position=&melodies=

@jacobdgm
Copy link
Contributor Author

jacobdgm commented Feb 9, 2023

I'm done my testing! At last! @annamorphism, are there any things you've noticed in your investigations that must be addressed before we update the production server to run the code that's running on staging?

@jacobdgm jacobdgm merged commit 099e7fc into production Feb 10, 2023
@jacobdgm
Copy link
Contributor Author

The new code is now running on production! All tests are passing, and I interacted with a few pages and everything appears to be running as it should! 🎉

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

3 participants