Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions client/agenda/AgendaDetailsModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ async function fetchSessionMaterials () {
<style lang="scss">
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "../shared/breakpoints";

.agenda-eventdetails {
width: 90vw;
Expand Down Expand Up @@ -403,5 +404,29 @@ async function fetchSessionMaterials () {
font-size: 16px;
}
}

.n-card-header {
@media screen and (max-width: $bs5-break-sm) {
display: block;
padding: 1em;
}
}

.n-card__content {
@media screen and (max-width: $bs5-break-sm) {
padding: 1em;

.detail-title {
display: block;
}

.nav-link,
.nav-link.active {
display: grid;
width: 1em;
border-width: 1em;
}
}
}
}
</style>
2 changes: 1 addition & 1 deletion dev/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ietf-tools/datatracker-app-base:20251201T1548
FROM ghcr.io/ietf-tools/datatracker-app-base:20260114T1756
LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion dev/build/TARGET_BASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20251201T1548
20260114T1756
8 changes: 6 additions & 2 deletions dev/build/migration-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
echo "Running Datatracker migrations..."
./ietf/manage.py migrate --settings=settings_local

echo "Running Blobdb migrations ..."
./ietf/manage.py migrate --settings=settings_local --database=blobdb
# Check whether the blobdb database exists - inspectdb will return a false
# status if not.
if ./ietf/manage.py inspectdb --database blobdb > /dev/null 2>&1; then
echo "Running Blobdb migrations ..."
./ietf/manage.py migrate --settings=settings_local --database=blobdb
fi

echo "Done!"
6 changes: 3 additions & 3 deletions dev/deploy-to-container/settings_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@

DE_GFM_BINARY = '/usr/local/bin/de-gfm'

# No real secrets here, these are public testing values _only_
APP_API_TOKENS = {
"ietf.api.views.ingest_email_test": ["ingestion-test-token"]
"ietf.api.red_api" : ["devtoken", "redtoken"], # Not a real secret
"ietf.api.views.ingest_email_test": ["ingestion-test-token"], # Not a real secret
"ietf.api.views_rpc" : ["devtoken"], # Not a real secret
}


# OIDC configuration
SITE_URL = 'https://__HOSTNAME__'
5 changes: 5 additions & 0 deletions docker/configs/settings_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,8 @@
bucket_name=f"{storagename}",
),
}

APP_API_TOKENS = {
"ietf.api.red_api" : ["devtoken", "redtoken"], # Not a real secret
"ietf.api.views_rpc" : ["devtoken"], # Not a real secret
}
25 changes: 20 additions & 5 deletions ietf/api/routers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,29 @@
from django.core.exceptions import ImproperlyConfigured
from rest_framework import routers

class PrefixedSimpleRouter(routers.SimpleRouter):
"""SimpleRouter that adds a dot-separated prefix to its basename"""

class PrefixedBasenameMixin:
"""Mixin to add a prefix to the basename of a rest_framework BaseRouter"""
def __init__(self, name_prefix="", *args, **kwargs):
self.name_prefix = name_prefix
if len(self.name_prefix) == 0 or self.name_prefix[-1] == ".":
raise ImproperlyConfigured("Cannot use a name_prefix that is empty or ends with '.'")
super().__init__(*args, **kwargs)

def get_default_basename(self, viewset):
basename = super().get_default_basename(viewset)
return f"{self.name_prefix}.{basename}"
def register(self, prefix, viewset, basename=None):
# Get the superclass "register" method from the class this is mixed-in with.
# This avoids typing issues with calling super().register() directly in a
# mixin class.
super_register = getattr(super(), "register")
if not super_register or not callable(super_register):
raise TypeError("Must mixin with superclass that has register() method")
super_register(prefix, viewset, basename=f"{self.name_prefix}.{basename}")


class PrefixedSimpleRouter(PrefixedBasenameMixin, routers.SimpleRouter):
"""SimpleRouter that adds a dot-separated prefix to its basename"""


class PrefixedDefaultRouter(PrefixedBasenameMixin, routers.DefaultRouter):
"""DefaultRouter that adds a dot-separated prefix to its basename"""

Loading