Merge develop into staging, 13 Aug 2024
#1595
Merged
Conversation
This file contains 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
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@2.2.1...2.2.2) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [django](https://github.com/django/django) from 4.2.11 to 4.2.14. - [Commits](django/django@4.2.11...4.2.14) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
- update urls.py with api view imports - directly import redirect views
Add legacy logos for acknowledgements page
Change instances of "Differentia Database" to "Differentiae Database"
Put view classes in separate files
- ChantSearchMSView: add filtering by indexing notes to the queryset - chant_search.html: add indexing notes search option in the form - chant_search.js: implement form logic for indexing notes search options
- ChantSearchMSView: add filtering by indexing notes to the queryset - chant_search.html: add indexing notes search option in the form - chant_search.js: implement form logic for indexing notes search options
Adds the segment_m2m many-to-many field to the source model. This additional field ensures that the data currently in the segment field is not overwritten. Once data in the segment field is transferred, this field can be renamed. Changes to the source create and source edit forms make this new field editable. Refs: #1549
With this change, we can make use of the python shell that runserver_plus provides when a python error occurs in django
Installs typing stubs for the requests package
…ture With a fix to the Cantus Index json-nextchants endpoint, we can now reduce the number of calls that need to be made to Cantus Index to support the suggested chants feature of the Chant Create page. All the data on the suggested chants that we need for the feature comes now in the result of that call and does not require additional json-cid calls.
…feature Additionally, cast the "count" attribute of the response to the json-nextchants endpoint to int.
…go_tests Introduce a separate docker-compose file for use with the django_tests github action that replicates the production run environment (use of gunicorn rather than the django development server).
- in populate_diff_id_fields.py - removed obsolete else block
… use 'service' instead of 'office'. - change all URL paths to use 'service/services'. #1401 - create redirects to ensure backwards compatibility with old 'office/offices' URLs. #1401 - update query parameters to use 'service' instead of 'office'. #1401 - rename the Office model to Service. #1402 - rename .office property of BaseChant to .service. #1402 - change all instances of 'office' to 'service' in the codebase. #1402 - update all references to 'office' to 'service' on the Django admin pages. #1581
Fix `populate_diff_id_fields` management command
Chant create: optimize suggested chants feature
This small change adds a text input filter to the chants for the source primary key. This allows chants to be filtered by source in the list.
This PR adds views for institutions, giving them each their own page on the Cantus site. Special care was taken to get the source counts and source links correct for logged in / not logged in users and published / unpublished sources. In addition external authorities are shown -- currently only RISM Online entries are in the external authorities, but others can be added. An entry for DIAMM as an external authority was also added so that links between Cantus and DIAMM are possible.
- fix corresponding tests from status code 302 to 301
Update URLs, models, codebase, and admin pages to use "service" instead of "office"
New: Add source key filter to chants
New: Add views for institutions
The sortable_header inclusion tag renders a table header for a column for which a view provides sort functionality. The tag adds links to the header that include `sort` and `order` query parameters that can be used by the view to sort queryset results.
- add functionality to sort by a source's holding institution country (the "Country" column) and city/name/siglum (the "Source" column) in the Source List view - use the sortable_header helper tag for sortable column headers in the source_list.html template - fix the value used in the source column to the source's heading property
- remove unused variables - reduce number of statements with assignment operator
…umns Make "Country" and "Source" columns sortable on Source List page
lucasmarchd01
approved these changes
Aug 13, 2024
|
Wait for merging, I'm going to add one more PR for the missing migration |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.