-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into issue-1391
- Loading branch information
Showing
53 changed files
with
2,944 additions
and
2,634 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| name: django-tests | ||
| on: | ||
| pull_request: | ||
| types: [opened, synchronize] | ||
| jobs: | ||
| run-tests: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - run: mkdir -p config/envs | ||
| - uses: SpicyPizza/[email protected] | ||
| with: | ||
| envkey_POSTGRES_DB: test_cantusdb | ||
| envkey_POSTGRES_USER: test_user | ||
| envkey_POSTGRES_HOST: postgres | ||
| envkey_POSTGRES_PORT: 5432 | ||
| envkey_PROJECT_ENVIRONMENT: PRODUCTION | ||
| envkey_CANTUSDB_STATIC_ROOT: /path/to/static | ||
| envkey_CANTUSDB_MEDIA_ROOT: /path/to/media | ||
| envkey_CANTUSDB_HOST: somehost | ||
| envkey_CANTUSDB_SECRET_KEY: "hereisakey1234" | ||
| envkey_POSTGRES_PASSWORD: woahagreatpasswordabc | ||
| envkey_AWS_EMAIL_HOST_USER: test_user | ||
| envkey_AWS_EMAIL_HOST_PASSWORD: test_password | ||
| directory: config/envs | ||
| file_name: dev_env | ||
| - run: docker compose -f docker-compose-development.yml build | ||
| - run: docker compose -f docker-compose-development.yml up -d | ||
| - run: docker compose -f docker-compose-development.yml exec -T django python manage.py test main_app.tests |
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
61 changes: 30 additions & 31 deletions
61
django/cantusdb_project/articles/templates/article_detail.html
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,39 @@ | ||
| {% extends "base.html" %} | ||
| {% extends "base_page_with_side_cards.html" %} | ||
| {% load helper_tags %} {# for recent_articles #} | ||
| {% block content %} | ||
| <div class="container"> | ||
| <title>{{ article.title }} | Cantus Database</title> | ||
| {% block title %} | ||
| <title>{{ article.title }} | Cantus Database</title> | ||
| {% endblock %} | ||
|
|
||
| {% block uppersidebar %} | ||
| <div class="search-bar mb-3"> | ||
| {% include "global_search_bar.html" %} | ||
| </div> | ||
| {% endblock %} | ||
|
|
||
| {% block maincontent %} | ||
| <h3> | ||
| {{ article.title }} | ||
| </h3> | ||
| <div class="row"> | ||
| <div class="p-3 col-lg-8 bg-white rounded main-content"> | ||
| <h3> | ||
| {{ article.title }} | ||
| </h3> | ||
| <div class="row"> | ||
| <div class="col"> | ||
| <div class="container"> | ||
| <div class="container text-wrap"> | ||
| <small>Submitted by <a href="{% url 'user-detail' article.author.id %}">{{ article.author }}</a> on {{ article.date_created|date:"D, m/d/Y - H:i" }}</small> | ||
| <div style="padding-top: 1em;"> | ||
| {{ article.body.html|safe }} | ||
| </div> | ||
| </div> | ||
| <div class="col"> | ||
| <div class="container"> | ||
| <div class="container text-wrap"> | ||
| <small>Submitted by <a href="{% url 'user-detail' article.author.id %}">{{ article.author }}</a> on {{ article.date_created|date:"D, m/d/Y - H:i" }}</small> | ||
| <div style="padding-top: 1em;"> | ||
| {{ article.body.html|safe }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="col p-0 sidebar"> | ||
| <div class="search-bar mb-3"> | ||
| {% include "global_search_bar.html" %} | ||
| </div> | ||
| <div class="card mt-3 w-100"> | ||
| <div class="card-header"> | ||
| What's New | ||
| </div> | ||
| <div class="card-body"> | ||
| {% recent_articles %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} | ||
| {% block lowersidebar %} | ||
| <div class="card"> | ||
| <div class="card-header"> | ||
| What's New | ||
| </div> | ||
| <div class="card-body"> | ||
| {% recent_articles %} | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| {% endblock %} |
70 changes: 33 additions & 37 deletions
70
django/cantusdb_project/articles/templates/article_list.html
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,39 @@ | ||
| {% extends "base.html" %} | ||
| {% load helper_tags %} {# for recent_articles #} | ||
| {% block content %} | ||
| <div class="container"> | ||
| <title>What's New | Cantus Database</title> | ||
| {% extends "base_page_with_side_cards.html" %} | ||
| {% load helper_tags %} {# for recent_articles #}\ | ||
| {% block title %} | ||
| <title>What's New | Cantus Database</title> | ||
| {% endblock %} | ||
| {% block uppersidebar %} | ||
| <div class="search-bar mb-3"> | ||
| {% include "global_search_bar.html" %} | ||
| </div> | ||
| {% endblock %} | ||
| {% block maincontent %} | ||
| <h3>What's New</h3> | ||
| {% for article in articles %} | ||
| <div class="row"> | ||
| <div class="p-3 col-lg-8 bg-white rounded main-content"> | ||
| <h3>What's New</h3> | ||
| {% for article in articles %} | ||
| <div class="row"> | ||
| <div class="col"> | ||
| <small>{{ article.date_created|date:"D, m/d/Y - H:i" }}</small> | ||
| <h4> | ||
| <a href="{% url 'article-detail' article.id %}">{{ article.title }}</a> | ||
| </h4> | ||
| <div class="container"> | ||
| <small> | ||
| {{ article.body.html|safe|truncatechars_html:3000 }} | ||
| </small> | ||
| </div> | ||
| </div> | ||
| <div class="col"> | ||
| <small>{{ article.date_created|date:"D, m/d/Y - H:i" }}</small> | ||
| <h4> | ||
| <a href="{% url 'article-detail' article.id %}">{{ article.title }}</a> | ||
| </h4> | ||
| <div class="container"> | ||
| <small> | ||
| {{ article.body.html|safe|truncatechars_html:3000 }} | ||
| </small> | ||
| </div> | ||
| {% endfor %} | ||
| {% include "pagination.html" %} | ||
| <br> | ||
| </div> | ||
| <div class="col p-0 sidebar"> | ||
| <div class="search-bar mb-3"> | ||
| {% include "global_search_bar.html" %} | ||
| </div> | ||
|
|
||
| <div class="card mt-3 w-100"> | ||
| <div class="card-header"> | ||
| What's New | ||
| </div> | ||
| <div class="card-body"> | ||
| {% recent_articles %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endfor %} | ||
| {% include "pagination.html" %} | ||
| {% endblock %} | ||
| {% block lowersidebar %} | ||
| <div class="card"> | ||
| <div class="card-header"> | ||
| What's New | ||
| </div> | ||
| <div class="card-body"> | ||
| {% recent_articles %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,25 @@ | ||
| from django.contrib import admin | ||
|
|
||
| from main_app.admin.base_admin import BaseModelAdmin | ||
| from main_app.models import Institution, InstitutionIdentifier | ||
|
|
||
| class InstitutionAdmin(admin.ModelAdmin): | ||
| pass | ||
|
|
||
| class InstitutionIdentifierInline(admin.TabularInline): | ||
| model = InstitutionIdentifier | ||
| extra = 0 | ||
| exclude = ["created_by", "last_updated_by"] | ||
|
|
||
|
|
||
| @admin.register(Institution) | ||
| class InstitutionAdmin(BaseModelAdmin): | ||
| list_display = ("name", "siglum", "get_city_region", "country") | ||
| search_fields = ("name", "siglum", "city", "region", "alternate_names") | ||
| list_filter = ("city",) | ||
| inlines = (InstitutionIdentifierInline,) | ||
|
|
||
| def get_city_region(self, obj) -> str: | ||
| city: str = obj.city if obj.city else "[No city]" | ||
| region: str = f"({obj.region})" if obj.region else "" | ||
| return f"{city} {region}" | ||
|
|
||
| get_city_region.short_description = "City" |
9 changes: 7 additions & 2 deletions
9
django/cantusdb_project/main_app/admin/institution_identifier.py
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| from django.contrib import admin | ||
|
|
||
| from main_app.admin.base_admin import BaseModelAdmin | ||
| from main_app.models import InstitutionIdentifier | ||
|
|
||
| class InstitutionIdentifierAdmin(admin.ModelAdmin): | ||
| pass | ||
|
|
||
| @admin.register(InstitutionIdentifier) | ||
| class InstitutionIdentifierAdmin(BaseModelAdmin): | ||
| list_display = ("identifier", "identifier_type") | ||
| raw_id_fields = ("institution",) |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.