diff --git a/README.md b/README.md index c6561e9..fee1584 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ To run a local development database **[docker](https://docs.docker.com/engine/in After installing docker use the following to create a database: ```bash -docker run --name postgres:12 -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postgres:12 +docker run --name sik.web.db -e POSTGRES_PASSWORD=postgres -p 5432:5432 -d postgres:12 ``` ## Development diff --git a/kaehmy/views.py b/kaehmy/views.py index 99430db..e0a05f3 100644 --- a/kaehmy/views.py +++ b/kaehmy/views.py @@ -123,6 +123,7 @@ def submit(request, *args, **kwargs): application = form.save() custom_name = form.cleaned_data.get("custom_role_name") custom_is_board = form.cleaned_data.get("custom_role_is_board") + kaehmybot_allowed = form.cleaned_data.get("kaehmybot") if len(custom_name) > 0: custom_role = CustomRole(name=custom_name, is_board=custom_is_board) @@ -141,7 +142,10 @@ def submit(request, *args, **kwargs): send_email(to=to_email, subject=subject, body=message, html=True) logging.debug(f"Sent kaehmy email to recipient <{to_email}>") - processHooks(message=f"Uusi New kaehmy! {name} -> {url}", eventType="kaehmy") + if kaehmybot_allowed or custom_is_board: + processHooks( + message=f"Uusi New kaehmy! {name} -> {url}", eventType="kaehmy" + ) else: context = {"error": form.errors} return render(request, "kaehmy/error.html", context) diff --git a/templates/kaehmy/header.html b/templates/kaehmy/header.html index 7cbdecb..b15aede 100644 --- a/templates/kaehmy/header.html +++ b/templates/kaehmy/header.html @@ -8,7 +8,7 @@
diff --git a/templates/kaehmy/kaehmy.html b/templates/kaehmy/kaehmy.html index f18f596..a95f43a 100644 --- a/templates/kaehmy/kaehmy.html +++ b/templates/kaehmy/kaehmy.html @@ -28,12 +28,12 @@