Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Merge Staging into Production, 2023-Sep-21 edition #1061

Merged
merged 30 commits into from
Sep 26, 2023
Merged

Merge Staging into Production, 2023-Sep-21 edition #1061

merged 30 commits into from
Sep 26, 2023

Conversation

jacobdgm
Copy link
Contributor

@jacobdgm jacobdgm commented Sep 21, 2023 •
edited
Loading

Pages that have been changed:

  • Admin Area
    • required fields no longer marked by red asterisks (they are still indicated by boldface)
    • Chant Change page:
      • "date created" and "date updated" fields are now read-only.
      • "CAO concordances" and a few other fields are now capitalized properly
    • Source Change page:
      • "date created", "date updated", "number of chants" and "number of melodies" fields are now read-only
      • in "available current editors", "available inventoried by", etc., users would appear twice in the list of names if they were both a contributor and an editor. This has been fixed, and all names now appear just once.
  • Chant Create page
    • When the previously created chant has no Cantus ID, we no longer display a link to cantusindex.org/id/None
  • Chant Detail page
    • fix bug where we would send a non-useful request to a CI API on page load, rather than properly updating the concordances with a request to the correct URL.
  • Chant Edit page
    • When a user has proofread permissions, they now see "Proofread" checkboxes beneath fields that can be proofread
  • Chant Proofread page
    • this page has been deleted, and its functionality has been added to the Chant Edit page
  • JSON Sources Export view (@dchiller checked)
    • We now only list sources from the CANTUS segment, and no longer include sources from Bower segment
  • My Sources page
    • we no longer display links to the Chant Proofread page, since it has been deleted.
  • General, behind the scenes:
    • Certbot cron job now also certifies www.cantusdatabase.org

lucasmarchd01 and others added 30 commits September 7, 2023 16:21
@lucasmarchd01
admin: add read_only fields to Chant and Source models
b3bcb6b
@jacobdgm
Admin Source Change: prevent users from appearing twice in Current Ed…
b8b9aa8 
…itors widget
@jacobdgm
Merge pull request #1023 from lucasmarchd01/issue-1022
a453530 
admin: add read_only fields to Chant and Source models
@jacobdgm
Merge pull request #1025 from jacobdgm/issue-1021
de2e5bb 
Admin Source Change: prevent users from appearing twice in Current Editors widget
@jacobdgm
update certbot cron job to request certificate for www.cantusdatabase…
1964a51 
….org

as well as just cantusdatabase.org
@jacobdgm
add second -d flag to certbot cron script
109b883
@jacobdgm
Chant Create: suggested chants: prevent link to cantusindex.org/id/No…
fd4d697 
…ne from displaying
@jacobdgm
Merge pull request #1038 from jacobdgm/issue-1037
58515e7 
Chant Create: suggested chants: prevent link to cantusindex.org/id/None from displaying
@jacobdgm
Merge pull request #1035 from jacobdgm/issue-1020
b07dc04 
update certbot cron job to request certificate for www.cantusdatabase.org
@lucasmarchd01
admin: remove asterisks on required fields
5837e90
@lucasmarchd01
admin: hide volpiano notes and volpiano intervals fields
3d8e271
@lucasmarchd01
Merge pull request #1040 from lucasmarchd01/issue-1039
d96d745 
admin: remove asterisks on required fields
@lucasmarchd01
chant-edit: add proofread checkboxes and proofread_by
dd2c6d6
@lucasmarchd01
Remove chant-proofread page
2c49a28
@lucasmarchd01
forms: fix error for proofread_by autocomplete widget
78b9281
@jacobdgm
add verbose names to several fields in models/base_chant.py
c95366a
@lucasmarchd01
permissions: update function name for user_can_proofread_chant
38e9b73
@lucasmarchd01
Merge pull request #1047 from lucasmarchd01/issue-1034
ff4ad0c 
Merge chant-proofread and chant-edit pages
@lucasmarchd01
Merge pull request #1043 from lucasmarchd01/issue-1041
3dc8fdf 
chant admin: hide volpiano_notes and volpiano_intervals fields
@jacobdgm
Merge pull request #1048 from jacobdgm/issue-1042
866cc94 
add verbose names to several fields in models/base_chant.py
@jacobdgm
Chant Detail: fix bug where we would send a request to a cantusindex.…
8fe6257 
…org/json-con/cantus_id/refresh
@jacobdgm
json_sources_export: ensure only sources from the CANTUS Segment appe…
337cc00 
…ar in response
@jacobdgm
Merge pull request #1056 from DDMAL/develop
d9e47d1 
Merge develop into staging, 2023-Sep-19 edition
@jacobdgm
Merge pull request #1055 from jacobdgm/issue-1054
058610c 
json_sources_export: ensure only sources from the CANTUS Segment appear in response
@jacobdgm
Merge pull request #1053 from jacobdgm/issue-1052
d450e1e 
Chant Detail: fix bug where we would send a request to a cantusindex.org/json-con/cantus_id/refresh
@jacobdgm
Merge pull request #1057 from DDMAL/develop
1099cb7 
Merge develop into staging, 2023-September-19 Edition, round two
@jacobdgm
fix failing tests in test_views.JsonSourcesExportTest
066cb16
@jacobdgm
JsonSourcesExportTest: add test_only_sources_from_cantus_segment_appe…
983f962 
…ar_in_results
@jacobdgm
Merge pull request #1059 from jacobdgm/issue-1058
da358fb 
Fix failing tests in JsonSourcesExportTest
@jacobdgm
Merge pull request #1060 from DDMAL/develop
a9e337f 
Merge develop into staging, 2023-Sep-21 Edition
@jacobdgm jacobdgm marked this pull request as ready for review September 21, 2023 17:01
@jacobdgm
Copy link
Contributor Author

All the pages that have been touched have been tested. I'm going to merge this PR and update the Production server.

@jacobdgm jacobdgm merged commit 6730be1 into production Sep 26, 2023
@jacobdgm
Copy link
Contributor Author

jacobdgm commented Sep 26, 2023 •
edited
Loading

The production server has been updated! All tests are passing, the website is behaving as expected, and the password reset feature works. Success!

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@dchiller dchiller Awaiting requested review from dchiller

@annamorphism annamorphism Awaiting requested review from annamorphism

@lucasmarchd01 lucasmarchd01 Awaiting requested review from lucasmarchd01

@JoyfulGen JoyfulGen Awaiting requested review from JoyfulGen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jacobdgm @lucasmarchd01