klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-10-31 00:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize calendar moderation and news list moderation

Browse Source
This commit is contained in:
Antoine Bartuccio
2025-02-25 17:21:16 +01:00
parent 07028c8dd8
commit 10701ccdfa
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
com/static/bundled/com/components/moderation-alert-index.ts
View File

@@ -10,6 +10,8 @@ const AlertState = {
PUBLISHED: 2, PUBLISHED: 2,
// biome-ignore lint/style/useNamingConvention: this feels more like an enum // biome-ignore lint/style/useNamingConvention: this feels more like an enum
DELETED: 3, DELETED: 3,
// biome-ignore lint/style/useNamingConvention: this feels more like an enum
DISPLAYED: 4, // When published at page generation
}; };
exportToHtml("AlertState", AlertState); exportToHtml("AlertState", AlertState);

4
com/templates/com/macros.jinja
View File

@@ -57,8 +57,8 @@
{# the news-moderated is received when a moderation alert is deleted or moderated #} {# the news-moderated is received when a moderation alert is deleted or moderated #}
@news-moderated.window="dispatchModeration($event)" @news-moderated.window="dispatchModeration($event)"
{% if alpineState %} {% if alpineState %}
x-modelable="{{ alpineState }}" x-model="{{ alpineState }}"
x-model="state" x-modelable="state"
{% endif %} {% endif %}
> >
<template x-if="state === AlertState.PENDING"> <template x-if="state === AlertState.PENDING">

8
com/templates/com/news_list.jinja
View File

@@ -59,17 +59,15 @@
class="news_event" class="news_event"
{%- if not date.news.is_published -%} {%- if not date.news.is_published -%}
x-data="{newsState: AlertState.PENDING}" x-data="{newsState: AlertState.PENDING}"
{% else %}
x-data="{newsState: AlertState.DISPLAYED}"
{%- endif -%} {%- endif -%}
> >
{% if not date.news.is_published %}
{# if a non published news is in the object list, {# if a non published news is in the object list,
the logged user is either an admin or the news author #} the logged user is either an admin or the news author #}
{{ news_moderation_alert(date.news, user, "newsState") }} {{ news_moderation_alert(date.news, user, "newsState") }}
{% endif %}
<div <div
{% if not date.news.is_published -%}
x-show="newsState !== AlertState.DELETED" x-show="newsState !== AlertState.DELETED"
{%- endif -%}
> >
<header class="row gap"> <header class="row gap">
{% if date.news.club.logo %} {% if date.news.club.logo %}
@@ -191,7 +189,7 @@
$refs.calendar.refreshEvents($event); $refs.calendar.refreshEvents($event);
} }
" "
@calendar-remove="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.DELETED})" @calendar-delete="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.DELETED})"
@calendar-unpublish="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.PENDING})" @calendar-unpublish="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.PENDING})"
@calendar-publish="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.PUBLISHED})" @calendar-publish="$dispatch('news-moderated', {newsId: $event.detail.id, state: AlertState.PUBLISHED})"
locale="{{ get_language() }}" locale="{{ get_language() }}"