#132 | #121: backoffice / dev-1.0-121 #131

Merged
thomas merged 151 commits from dev-1.0-121 into develop-1.0 2024-04-28 20:02:14 +00:00
3 changed files with 16 additions and 15 deletions
Showing only changes of commit c335ed9fb9 - Show all commits

View File

@ -40,6 +40,11 @@ urls = [
path("api/", include((api, "aircox"), namespace="api")),
# ---- ---- objects views
# ---- articles
path(
_("articles/<slug:slug>/"),
views.ArticleDetailView.as_view(),
name="article-detail",
),
path(
_("articles/"),
views.ArticleListView.as_view(model=models.Article),
@ -50,11 +55,6 @@ urls = [
views.ArticleListView.as_view(model=models.Article),
name="article-list",
),
path(
_("articles/<slug:slug>/"),
views.ArticleDetailView.as_view(),
name="article-detail",
),
# ---- timetable
path(_("timetable/"), views.TimeTableView.as_view(), name="timetable-list"),
path(
@ -73,14 +73,6 @@ urls = [
views.PageListView.as_view(model=models.Page, attach_to_value=models.StaticPage.Target.PAGES),
name="page-list",
),
path(
_("pages/"),
views.BasePageListView.as_view(
model=models.StaticPage,
queryset=models.StaticPage.objects.filter(attach_to__isnull=True),
),
name="static-page-list",
),
path(
_("pages/<slug:slug>/"),
views.BasePageDetailView.as_view(
@ -89,6 +81,14 @@ urls = [
),
name="static-page-detail",
),
path(
_("pages/"),
views.BasePageListView.as_view(
model=models.StaticPage,
queryset=models.StaticPage.objects.filter(attach_to__isnull=True),
),
name="static-page-list",
),
# ---- programs
path(_("programs/"), views.ProgramListView.as_view(), name="program-list"),
path(_("programs/c/<slug:category_slug>/"), views.ProgramListView.as_view(), name="program-list"),

View File

@ -23,10 +23,11 @@ class HomeView(AttachedToMixin, BaseView, ListView):
def get_logs(self, diffusions):
today = date.today()
now = datetime.now()
# diffs = Diffusion.objects.on_air().date(today)
object_list = self.object_list
diffs = list(object_list[: self.related_count])
logs = Log.objects.on_air().filter(track__isnull=False)
logs = Log.objects.on_air().filter(track__isnull=False, date__lte=now)
if diffs:
min_date = diffs[-1].start - timedelta(hours=1)
logs = logs.after(min_date)

View File

@ -1,7 +1,7 @@
@use "./vars" as v;
@use "./components";
@import "./vendor";
@use "./vendor";
// ---- main theme & layout