Merge pull request #795 from ae-utbm/taiste

Last update before Inté
ae-utbm · Aug 27, 2024 · b4749f2 · b4749f2
2 parents af724a1 + e564c66
commit b4749f2
Show file tree

Hide file tree

Showing 129 changed files with 917 additions and 33,671 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -40,8 +40,7 @@ jobs:
           poetry install --with prod --without docs,tests
           poetry run ./manage.py install_xapian
           poetry run ./manage.py migrate
-          echo "yes" | poetry run ./manage.py collectstatic
-          poetry run ./manage.py compilestatic
+          poetry run ./manage.py collectstatic --clear --noinput
           poetry run ./manage.py compilemessages
 
           sudo systemctl restart uwsgi

diff --git a/.github/workflows/taiste.yml b/.github/workflows/taiste.yml
@@ -39,8 +39,7 @@ jobs:
           poetry install --with prod --without docs,tests
           poetry run ./manage.py install_xapian
           poetry run ./manage.py migrate
-          echo "yes" | poetry run ./manage.py collectstatic
-          poetry run ./manage.py compilestatic
+          poetry run ./manage.py collectstatic --clear --noinput
           poetry run ./manage.py compilemessages
 
           sudo systemctl restart uwsgi

diff --git a/core/static/com/img/fb-icon.png → com/static/com/img/fb-icon.png b/core/static/com/img/fb-icon.png → com/static/com/img/fb-icon.png
diff --git a/core/static/com/img/invitation_bannerP22.png → com/static/com/img/invitation_bannerP22.png b/core/static/com/img/invitation_bannerP22.png → com/static/com/img/invitation_bannerP22.png
diff --git a/core/static/com/img/news.png → com/static/com/img/news.png b/core/static/com/img/news.png → com/static/com/img/news.png
diff --git a/core/static/com/img/twitter-icon.png → com/static/com/img/twitter-icon.png b/core/static/com/img/twitter-icon.png → com/static/com/img/twitter-icon.png
diff --git a/core/static/com/img/weekmail_banner.png → com/static/com/img/weekmail_banner.png b/core/static/com/img/weekmail_banner.png → com/static/com/img/weekmail_banner.png
diff --git a/core/static/com/img/weekmail_bannerA18.jpg → com/static/com/img/weekmail_bannerA18.jpg b/core/static/com/img/weekmail_bannerA18.jpg → com/static/com/img/weekmail_bannerA18.jpg
diff --git a/core/static/com/img/weekmail_bannerA19.jpg → com/static/com/img/weekmail_bannerA19.jpg b/core/static/com/img/weekmail_bannerA19.jpg → com/static/com/img/weekmail_bannerA19.jpg
diff --git a/core/static/com/img/weekmail_bannerV1P22.png → com/static/com/img/weekmail_bannerV1P22.png b/core/static/com/img/weekmail_bannerV1P22.png → com/static/com/img/weekmail_bannerV1P22.png
diff --git a/core/static/com/img/weekmail_bannerV2P22.png → com/static/com/img/weekmail_bannerV2P22.png b/core/static/com/img/weekmail_bannerV2P22.png → com/static/com/img/weekmail_bannerV2P22.png
diff --git a/core/static/com/img/weekmail_footerA18.jpg → com/static/com/img/weekmail_footerA18.jpg b/core/static/com/img/weekmail_footerA18.jpg → com/static/com/img/weekmail_footerA18.jpg
diff --git a/core/static/com/img/weekmail_footerA19.jpg → com/static/com/img/weekmail_footerA19.jpg b/core/static/com/img/weekmail_footerA19.jpg → com/static/com/img/weekmail_footerA19.jpg
diff --git a/core/static/com/img/weekmail_footerP22.png → com/static/com/img/weekmail_footerP22.png b/core/static/com/img/weekmail_footerP22.png → com/static/com/img/weekmail_footerP22.png
diff --git a/core/static/com/js/poster_list.js → com/static/com/js/poster_list.js b/core/static/com/js/poster_list.js → com/static/com/js/poster_list.js
diff --git a/core/static/com/js/slideshow.js → com/static/com/js/slideshow.js b/core/static/com/js/slideshow.js → com/static/com/js/slideshow.js
diff --git a/core/static/com/slideshow.scss → com/static/css/slideshow.scss b/core/static/com/slideshow.scss → com/static/css/slideshow.scss
diff --git a/com/templates/com/screen_slideshow.jinja b/com/templates/com/screen_slideshow.jinja
@@ -2,7 +2,7 @@
 <html lang="fr">
   <head>
     <title>{% trans %}Slideshow{% endtrans %}</title>
-    <link href="{{ scss('com/slideshow.scss') }}" rel="stylesheet" type="text/css" />
+    <link href="{{ scss('com/css/slideshow.scss') }}" rel="stylesheet" type="text/css" />
   </head>
   <body>
     <div id="slideshow">

diff --git a/core/admin.py b/core/admin.py
@@ -16,7 +16,7 @@
 from django.contrib import admin
 from django.contrib.auth.models import Group as AuthGroup
 
-from core.models import Group, Page, SithFile, User
+from core.models import Group, OperationLog, Page, SithFile, User
 
 admin.site.unregister(AuthGroup)
 
@@ -53,3 +53,10 @@ class SithFileAdmin(admin.ModelAdmin):
     list_display = ("name", "owner", "size", "date", "is_in_sas")
     autocomplete_fields = ("parent", "owner", "moderator")
     search_fields = ("name", "parent__name")
+
+
+@admin.register(OperationLog)
+class OperationLogAdmin(admin.ModelAdmin):
+    list_display = ("label", "operator", "operation_type", "date")
+    search_fields = ("label", "date", "operation_type")
+    autocomplete_fields = ("operator",)
diff --git a/core/management/commands/compilestatic.py b/core/management/commands/compilestatic.py
diff --git a/core/scss/processor.py b/core/scss/processor.py
diff --git a/core/scss/storage.py b/core/scss/storage.py
diff --git a/core/static/core/js/script.js b/core/static/core/js/script.js
@@ -69,17 +69,41 @@ function getCSRFToken() {
 
 const initialUrlParams = new URLSearchParams(window.location.search);
 
-function update_query_string(key, value) {
-    const url = new URL(window.location.href);
+/**
+ * @readonly
+ * @enum {number}
+ */
+const History = {
+    NONE: 0,
+    PUSH: 1,
+    REPLACE: 2,
+};
+
+/**
+ * @param {string} key
+ * @param {string | string[] | null} value
+ * @param {History} action
+ * @param {URL | null} url
+ */
+function update_query_string(key, value, action = History.REPLACE, url = null) {
+    if (!url){
+        url = new URL(window.location.href);
+    }
     if (!value) {
         // If the value is null, undefined or empty => delete it
         url.searchParams.delete(key)
     } else if (Array.isArray(value)) {
-
         url.searchParams.delete(key)
         value.forEach((v) => url.searchParams.append(key, v))
     } else {
         url.searchParams.set(key, value);
     }
-    history.pushState(null, document.title, url.toString());
+
+    if (action === History.PUSH) {
+        history.pushState(null, "", url.toString());
+    } else if (action === History.REPLACE) {
+        history.replaceState(null, "", url.toString());
+    }
+
+    return url;
 }
diff --git a/core/static/core/js/sentry/bundle.min.js b/core/static/core/js/sentry/bundle.min.js