From faf71976bdd8b8d42794c3cc9f66e7fa7abfd9f8 Mon Sep 17 00:00:00 2001 From: heinzel Date: Tue, 10 Sep 2024 10:21:10 +0200 Subject: [PATCH 1/2] Fix deploy_stage workflow --- .gitea/workflows/deploy_stage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/deploy_stage.yml b/.gitea/workflows/deploy_stage.yml index 70f79f9..566acaa 100644 --- a/.gitea/workflows/deploy_stage.yml +++ b/.gitea/workflows/deploy_stage.yml @@ -13,6 +13,8 @@ jobs: name: Deploy into stage environment runs-on: [django-dav-events, kitty] steps: + - name: "Pull code" + run: git -C "$DEPLOY_DIR/src/django-dav-events" pull - name: "Migrate database" run: $DEPLOY_DIR/python/bin/python $DEPLOY_DIR/django/manage.py migrate --noinput - name: "Collect static files" From a43c15422c3e81f84afec43c6bdb6aca30d341de Mon Sep 17 00:00:00 2001 From: heinzel Date: Tue, 10 Sep 2024 15:02:33 +0200 Subject: [PATCH 2/2] dav_registration: fixed filter buttons ("all" button not active) --- .../templates/dav_registration/event_list.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dav_registration/templates/dav_registration/event_list.html b/dav_registration/templates/dav_registration/event_list.html index 6b11534..5073e72 100644 --- a/dav_registration/templates/dav_registration/event_list.html +++ b/dav_registration/templates/dav_registration/event_list.html @@ -132,12 +132,6 @@ var filter_cleaned = []; var filter_expr; - if(filter.length > 0) { - $("#btn-filter-All").addClass("btn-white"); - } else { - $("#btn-filter-All").removeClass("btn-white"); - } - for(let i in choices) { if(filter.indexOf(choices[i]) >= 0) { filter_cleaned.push(choices[i]); @@ -148,8 +142,10 @@ } if(filter_cleaned.length > 0) { + $("#btn-filter-All").addClass("btn-white"); filter_expr = "(" + filter_cleaned.join("|") + "),"; } else { + $("#btn-filter-All").removeClass("btn-white"); filter_expr = ""; }