Merge branch 'master' into stage
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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 = "";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user