From 7708140ae38d31e7bb260c6c81b430e10546b784 Mon Sep 17 00:00:00 2001 From: Robbert <104075630+RobbertRitsema@users.noreply.github.com> Date: Fri, 18 Oct 2024 23:33:06 +0200 Subject: [PATCH] fix: startup html errors (#889) --------- Co-authored-by: Robbert Ritsema Co-authored-by: Frank Dekker --- docker-compose.override.yml | 3 --- docker-compose.production.yml | 3 --- docker-compose.yml | 2 -- templates/app/admin/edit_repository.html.twig | 2 +- templates/app/project/projects.html.twig | 8 +++++--- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 0665f91b5..e20d7501f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,7 +1,4 @@ ## overrides for development - -version: '3' - services: nginx: volumes: diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 4083eb992..7944cd32a 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,7 +1,4 @@ ## overrides for production - -version: '3' - services: nginx: volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 412a69d55..9e78934c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: nginx: container_name: ${NGINX_CONTAINER:-nginx} diff --git a/templates/app/admin/edit_repository.html.twig b/templates/app/admin/edit_repository.html.twig index b1980d700..50c2a905c 100644 --- a/templates/app/admin/edit_repository.html.twig +++ b/templates/app/admin/edit_repository.html.twig @@ -56,7 +56,7 @@ {{ inputFieldRow(form.repository.updateRevisionsInterval) }} {{ inputFieldRow(form.repository.validateRevisionsInterval) }} - {% if form.repository.gitlabProjectId %} + {% if form.repository.gitlabProjectId is defined %}

{{ 'integrations'|trans }}


{{ inputFieldRow(form.repository.gitlabProjectId) }} diff --git a/templates/app/project/projects.html.twig b/templates/app/project/projects.html.twig index 0f6af54d1..d6324adf8 100644 --- a/templates/app/project/projects.html.twig +++ b/templates/app/project/projects.html.twig @@ -13,9 +13,11 @@ href="{{ path('DR\\Review\\Controller\\App\\Reviews\\ReviewsController', {id: repository.id}) }}"> {{- repository.displayName -}} - - {{ projectsModel.revisionCount[repository.id]|format_number }} {{ 'revisions'|trans|lower }} - + {% if projectsModel.revisionCount[repository.id] is defined %} + + {{ projectsModel.revisionCount[repository.id]|format_number }} {{ 'revisions'|trans|lower }} + + {% endif %} {%- endfor -%}