DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Merge branch 'master' into stage
All checks were successful
Deploy into stage environment / Deploy into stage environment (push) Successful in 3s
Details
Run tests / Execute tox to run the test suite (push) Successful in 3m23s
Details

Browse Source
This commit is contained in:
heinzel
2024-09-10 15:03:54 +02:00
parent fab87ffa21 a43c15422c
commit 0e0d302f0c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/deploy_stage.yml
View File

@@ -13,6 +13,8 @@ jobs:
name: Deploy into stage environment name: Deploy into stage environment
runs-on: [django-dav-events, kitty] runs-on: [django-dav-events, kitty]
steps: steps:
- name: "Pull code"
run: git -C "$DEPLOY_DIR/src/django-dav-events" pull
- name: "Migrate database" - name: "Migrate database"
run: $DEPLOY_DIR/python/bin/python $DEPLOY_DIR/django/manage.py migrate --noinput run: $DEPLOY_DIR/python/bin/python $DEPLOY_DIR/django/manage.py migrate --noinput
- name: "Collect static files" - name: "Collect static files"

8
dav_registration/templates/dav_registration/event_list.html
View File

@@ -132,12 +132,6 @@
var filter_cleaned = []; var filter_cleaned = [];
var filter_expr; 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) { for(let i in choices) {
if(filter.indexOf(choices[i]) >= 0) { if(filter.indexOf(choices[i]) >= 0) {
filter_cleaned.push(choices[i]); filter_cleaned.push(choices[i]);
@@ -148,8 +142,10 @@
} }
if(filter_cleaned.length > 0) { if(filter_cleaned.length > 0) {
$("#btn-filter-All").addClass("btn-white");
filter_expr = "(" + filter_cleaned.join("|") + "),"; filter_expr = "(" + filter_cleaned.join("|") + "),";
} else { } else {
$("#btn-filter-All").removeClass("btn-white");
filter_expr = ""; filter_expr = "";
} }