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, 2023-Dec-05 edition #1196

Merged
merged 45 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
cc5fc60
add new keys to json_cid API dictionary
jacobdgm Nov 28, 2023
69b2fab
json-cid API: fix full_text key
jacobdgm Nov 28, 2023
39ba91a
JsonCidTest: update test_structure docstring
jacobdgm Nov 28, 2023
5cd4033
JsonCidTest: update test_structure to match updated specification
jacobdgm Nov 28, 2023
8462ae5
JsonCidTest: update test_values to match new specification
jacobdgm Nov 28, 2023
7c512e6
Chant Edit: Add link to Differentiae Database
jacobdgm Nov 28, 2023
1a5a495
Chant Create: Update Differentiae Database link to match that on Chan…
jacobdgm Nov 28, 2023
9ed1237
Chant Create: Differentiae Database label: correct spelling
jacobdgm Nov 28, 2023
669710a
Chant Edit: Update Differentiae Database label to match label on Chan…
jacobdgm Nov 28, 2023
c953e42
Chant Create, Edit: set Diff DB link to class='text-muted'
jacobdgm Nov 28, 2023
cef8c54
management/commands: Delete sync commands
jacobdgm Nov 28, 2023
89e2753
management/commands: Delete add_all_users command
jacobdgm Nov 28, 2023
cc01465
management/commands: Delete update_differentia_new command
jacobdgm Nov 28, 2023
3aa5a42
management/commands: Delete merge_indexer_user command
jacobdgm Nov 28, 2023
922a98a
management/commands: Delete replace_indexer_fields command
jacobdgm Nov 28, 2023
a0e414a
management/commands: Delete populate_volpiano_new_fields command
jacobdgm Nov 28, 2023
813009c
management/commands: Delete populate_next_chant_fields command
jacobdgm Nov 28, 2023
c2c8c3b
management/commands: Delete populate_is_last_chant_in_feast command
jacobdgm Nov 28, 2023
db7e9ea
management/commands: Delete populate_chant_fields command
jacobdgm Nov 28, 2023
839ba35
management/commands: Delete populate_chant_and_melody_counts command
jacobdgm Nov 28, 2023
f2f9508
management/commands: Delete add_unknown_source command
jacobdgm Nov 28, 2023
c92c639
management/commands: Delete add_unknown_source command
jacobdgm Nov 28, 2023
9439990
test_views: Rework JsonCidTest.test_values for improved clarity
jacobdgm Nov 30, 2023
c751242
Revert "management/commands: Delete populate_chant_fields command"
jacobdgm Nov 30, 2023
830ff9c
populate_chant_fields command: Add documentation
jacobdgm Nov 30, 2023
351a6f5
management/commands: rename populate_chant_fields -> touch_all_chants
jacobdgm Nov 30, 2023
4efb037
management/commands/touch_all_chants: Improve messages printed to con…
jacobdgm Nov 30, 2023
ac14103
management/commands: Delete add_differentiae command
jacobdgm Nov 30, 2023
05bcdb6
Add django-reversion to requirements.txt
jacobdgm Nov 30, 2023
d7430c8
Add django-reversion to INSTALLED_APPS and MIDDLEWARE
jacobdgm Nov 30, 2023
93e1794
use icontains for provenance autocomplete
lucasmarchd01 Nov 30, 2023
b81eac5
admin area: Ensure all models registered with reversion.admin.Version…
jacobdgm Nov 30, 2023
671c443
Merge pull request #1179 from jacobdgm/1168-del-mgmt-commands
jacobdgm Nov 30, 2023
9ba0279
Merge pull request #1177 from jacobdgm/1170-json-cid
jacobdgm Nov 30, 2023
c1d9252
Merge pull request #1178 from jacobdgm/1137-diff-db-link
jacobdgm Nov 30, 2023
508f5d9
Merge pull request #1182 from lucasmarchd01/issue-1160
jacobdgm Dec 1, 2023
ad92003
search bar, Chant Search: change Cantus ID vs Incipit search behavior
jacobdgm Dec 1, 2023
54aeca5
test_views.ChantSearchViewTest: Write test_search_bar_search test case
jacobdgm Dec 1, 2023
bb7a585
global search bar: fix bug where we used to return a chant's siglum
jacobdgm Dec 1, 2023
8634bfe
ajax_search_bar: Refactor for improved clarity and add type annotations
jacobdgm Dec 1, 2023
e957beb
AjaxSearchBarTest: Add test_response and test_incipit_search test cases
jacobdgm Dec 1, 2023
67721a6
test_views.AjaxSerachBarTest: Add test_cantus_id_search
jacobdgm Dec 1, 2023
83ffd31
Merge pull request #1188 from jacobdgm/1138-search-bar-policy
jacobdgm Dec 5, 2023
e2a9e5c
Merge pull request #1184 from jacobdgm/430-django-reversion
jacobdgm Dec 5, 2023
1303c54
Merge pull request #1190 from DDMAL/develop
jacobdgm Dec 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions django/cantusdb_project/cantusdb/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"main_app",
"articles",
"django_quill", # to provide rich-text field for articles
"reversion", # django-reversion, for version history of objects in database
"users",
]

Expand All @@ -73,6 +74,7 @@
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"django.contrib.flatpages.middleware.FlatpageFallbackMiddleware",
"reversion.middleware.RevisionMiddleware",
]

ROOT_URLCONF = "cantusdb.urls"
Expand Down
3 changes: 2 additions & 1 deletion django/cantusdb_project/main_app/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib import admin
from reversion.admin import VersionAdmin
from main_app.models import *
from main_app.forms import (
AdminCenturyForm,
Expand All @@ -22,7 +23,7 @@
)


class BaseModelAdmin(admin.ModelAdmin):
class BaseModelAdmin(VersionAdmin):
exclude = EXCLUDE

# if an object is created in the admin interface, assign the user to the created_by field
Expand Down
106 changes: 0 additions & 106 deletions django/cantusdb_project/main_app/management/commands/add_all_users.py

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions django/cantusdb_project/main_app/management/commands/add_prefix.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.