CONCD-654 Merge Feature branch into Main

Pipfile

@@ -44,6 +44,7 @@ django-admin-multiple-choice-list-filter = "*"
 django-npm = "*"
 fpdf2 = "==2.5.5"
 pymemcache = "*"
+black = ">=24"
 weasyprint = "*"
 tesseract = "==0.1.3"
 pytesseract = "*"

concordia/admin/__init__.py

@@ -30,17 +30,20 @@
  Banner,
  Campaign,
  CampaignRetirementProgress,
+ Card,
+ CardFamily,
  CarouselSlide,
+ Guide,
  Item,
  Project,
  Resource,
  ResourceFile,
- SimpleContentBlock,
  SimplePage,
  SiteReport,
  Tag,
  Topic,
  Transcription,
+ TutorialCard,
  UserAssetTagCollection,
  UserProfileActivity,
 )
@@ -61,6 +64,7 @@
  AssetCampaignListFilter,
  AssetCampaignStatusListFilter,
  AssetProjectListFilter,
+ CardCampaignListFilter,
  ItemCampaignListFilter,
  ItemCampaignStatusListFilter,
  ItemProjectListFilter,
@@ -86,9 +90,10 @@
 from .forms import (
  AdminItemImportForm,
  CampaignAdminForm,
+ CardAdminForm,
+ GuideAdminForm,
  ProjectAdminForm,
  SanitizedDescriptionAdminForm,
- SimpleContentBlockAdminForm,
 )
 
 logger = logging.getLogger(__name__)
@@ -193,6 +198,7 @@ class CampaignAdmin(admin.ModelAdmin, CustomListDisplayFieldsMixin):
  )
  list_display_links = ("title",)
  prepopulated_fields = {"slug": ("title",)}
+ raw_id_fields = ("card_family",)
  search_fields = ["title", "description"]
  list_filter = (
  "published",
@@ -793,19 +799,6 @@ def export_to_excel(self, request, queryset):
  actions = (export_to_csv, export_to_excel)
 
 
-@admin.register(SimpleContentBlock)
-class SimpleContentBlockAdmin(admin.ModelAdmin):
- form = SimpleContentBlockAdminForm
-
- list_display = ("slug", "created_on", "updated_on")
- readonly_fields = ("created_on", "updated_on")
-
- fieldsets = (
- (None, {"fields": ("created_on", "updated_on", "slug")}),
- ("Body", {"classes": ("markdown-preview",), "fields": ("body",)}),
- )
-
-
 @admin.register(CarouselSlide)
 class CarouselSlideAdmin(admin.ModelAdmin):
  list_display = ("headline", "published", "ordering")
@@ -991,3 +984,30 @@ def completion(self, obj):
  total = obj.project_total + obj.item_total + obj.asset_total
  removed = obj.projects_removed + obj.items_removed + obj.assets_removed
  return "{}%".format(round(removed / total * 100, 2))
+
+
+@admin.register(Card)
+class CardAdmin(admin.ModelAdmin):
+ form = CardAdminForm
+ fields = ("title", "display_heading", "body_text", "image", "image_alt_text")
+ list_display = ["title", "created_on", "updated_on"]
+ list_filter = (CardCampaignListFilter, "updated_on")
+
+
+class TutorialInline(admin.TabularInline):
+ model = TutorialCard
+ extra = 1
+ raw_id_fields = ("card",)
+
+
+@admin.register(CardFamily)
+class CardFamilyAdmin(admin.ModelAdmin):
+ inlines = (TutorialInline,)
+
+ class Media:
+ js = ("admin/custom-inline.js",)
+
+
+@admin.register(Guide)
+class GuideAdmin(admin.ModelAdmin):
+ form = GuideAdminForm

concordia/admin/filters.py

@@ -67,6 +67,31 @@ def queryset(self, request, queryset):
  return queryset
 
 
+class CardCampaignListFilter(admin.SimpleListFilter):
+ """
+ Allow CMs to filter cards by campaign
+ """
+
+ title = _("campaign")
+ parameter_name = "campaign"
+
+ def lookups(self, request, model_admin):
+ return Campaign.objects.exclude(card_family__isnull=True).values_list(
+ "pk", "title"
+ )
+
+ def queryset(self, request, queryset):
+ campaign_id = self.value()
+ if campaign_id:
+ card_family = Campaign.objects.get(pk=campaign_id).card_family
+ if card_family is None:
+ pks = []
+ else:
+ pks = card_family.cards.values_list("pk", flat=True)
+ queryset = queryset.filter(id__in=pks)
+ return queryset
+
+
 class ProjectCampaignListFilter(CampaignListFilter):
  parameter_name = "campaign__id__exact"
  status_filter_parameter = "campaign__status"

concordia/admin/forms.py

@@ -2,7 +2,7 @@
 from django import forms
 from tinymce.widgets import TinyMCE
 
-from ..models import Campaign, Project
+from ..models import Campaign, Card, Guide, Project
 
 FRAGMENT_ALLOWED_TAGS = {
  "a",
@@ -89,7 +89,7 @@ def clean_short_description(self):
  )
 
 
-class CampaignAdminForm(forms.ModelForm):
+class CampaignAdminForm(SanitizedDescriptionAdminForm):
  class Meta(SanitizedDescriptionAdminForm.Meta):
  model = Campaign
  widgets = {
@@ -114,3 +114,21 @@ def clean_body(self):
  tags=BLOCK_ALLOWED_TAGS,
  attributes=ALLOWED_ATTRIBUTES,
  )
+
+
+class CardAdminForm(forms.ModelForm):
+ class Meta:
+ model = Card
+ widgets = {
+ "body_text": TinyMCE(),
+ }
+ fields = "__all__"
+
+
+class GuideAdminForm(forms.ModelForm):
+ class Meta:
+ model = Guide
+ widgets = {
+ "body": TinyMCE(),
+ }
+ fields = "__all__"

concordia/admin/views.py

@@ -1,16 +1,20 @@
 import re
 import tempfile
 import time
+from http import HTTPStatus
 
 from bittersweet.models import validated_get_or_create
 from celery import Celery
+from django.apps import apps
 from django.contrib import messages
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import permission_required
 from django.core.exceptions import ValidationError
 from django.db.models import OuterRef, Subquery
+from django.http import JsonResponse
 from django.shortcuts import render
 from django.utils.text import slugify
+from django.views import View
 from django.views.decorators.cache import never_cache
 from tabular_export.core import export_to_csv_response, flatten_queryset
 
@@ -611,3 +615,18 @@ def admin_retired_site_report_view(request):
  data.append(row)
 
  return export_to_csv_response("retired-site-report.csv", headers, data)
+
+
+class SerializedObjectView(View):
+ def get(self, request, *args, **kwargs):
+ model_name = request.GET.get("model_name")
+ object_id = request.GET.get("object_id")
+ field_name = request.GET.get("field_name")
+
+ model = apps.get_model(app_label="concordia", model_name=model_name)
+ try:
+ instance = model.objects.get(pk=object_id)
+ value = getattr(instance, field_name)
+ return JsonResponse({field_name: value})
+ except model.DoesNotExist:
+ return JsonResponse({"status": "false"}, status=HTTPStatus.NOT_FOUND)

concordia/admin_site.py

@@ -8,6 +8,7 @@ class ConcordiaAdminSite(admin.AdminSite):
 
  def get_urls(self):
  from concordia.admin.views import (
+ SerializedObjectView,
  admin_bulk_import_review,
  admin_bulk_import_view,
  admin_retired_site_report_view,
@@ -37,6 +38,11 @@ def get_urls(self):
  project_level_export,
  name="project-level-export",
  ),
+ path(
+ "serialized_object/",
+ SerializedObjectView.as_view(),
+ name="serialized_object",
+ ),
  ]
 
  return custom_urls + urls

concordia/migrations/0087_auto_20240213_0756.py

@@ -0,0 +1,136 @@
+# Generated by Django 3.2.23 on 2024-02-13 12:56
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("concordia", "0086_auto_20231215_1311"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="Card",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("image_alt_text", models.TextField(blank=True)),
+ (
+ "image",
+ models.ImageField(blank=True, null=True, upload_to="card_images"),
+ ),
+ ("title", models.CharField(max_length=80)),
+ ("body_text", models.TextField(blank=True)),
+ ("created_on", models.DateTimeField(auto_now_add=True)),
+ ("updated_on", models.DateTimeField(auto_now=True, null=True)),
+ (
+ "display_heading",
+ models.CharField(blank=True, max_length=80, null=True),
+ ),
+ ],
+ options={
+ "ordering": ("title",),
+ },
+ ),
+ migrations.CreateModel(
+ name="CardFamily",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "slug",
+ models.SlugField(allow_unicode=True, max_length=80, unique=True),
+ ),
+ ("default", models.BooleanField(default=False)),
+ ],
+ options={
+ "verbose_name_plural": "card families",
+ },
+ ),
+ migrations.CreateModel(
+ name="Guide",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("title", models.CharField(max_length=80)),
+ ("body", models.TextField(blank=True)),
+ ("order", models.IntegerField(default=1)),
+ ("link_text", models.CharField(blank=True, max_length=80, null=True)),
+ ("link_url", models.CharField(blank=True, max_length=255, null=True)),
+ ],
+ ),
+ migrations.CreateModel(
+ name="TutorialCard",
+ fields=[
+ (
+ "id",
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("order", models.IntegerField(default=0)),
+ (
+ "card",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE, to="concordia.card"
+ ),
+ ),
+ (
+ "tutorial",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to="concordia.cardfamily",
+ ),
+ ),
+ ],
+ options={
+ "verbose_name_plural": "cards",
+ },
+ ),
+ migrations.DeleteModel(
+ name="SimpleContentBlock",
+ ),
+ migrations.AddField(
+ model_name="cardfamily",
+ name="cards",
+ field=models.ManyToManyField(
+ through="concordia.TutorialCard", to="concordia.Card"
+ ),
+ ),
+ migrations.AddField(
+ model_name="campaign",
+ name="card_family",
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to="concordia.cardfamily",
+ ),
+ ),
+ ]