Merge pull request 'dont-show-guests-on-external-boats' (#486) from dont-show-guests-on-external-boats into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m57s
CI/CD Pipeline / deploy-staging (push) Successful in 6m13s
CI/CD Pipeline / deploy-main (push) Has been skipped

Reviewed-on: #486
This commit is contained in:
philipp 2024-05-12 23:08:41 +02:00
commit fa0dc5b544
2 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@ jobs:
cargo build cargo build
cd frontend && npm install && npm run build cd frontend && npm install && npm run build
- name: Frontend tests - name: Frontend tests
run: cd frontend && npx playwright test --workers 1 --reporter line run: cd frontend && npx playwright install && npx playwright test --workers 1 --reporter line
- name: Backend tests - name: Backend tests
run: cargo test --verbose run: cargo test --verbose
#- uses: actions/upload-artifact@v3 #- uses: actions/upload-artifact@v3

View File

@ -152,7 +152,7 @@
{% endfor %} {% endfor %}
{% set amount_rowers = log.rowers | length %} {% set amount_rowers = log.rowers | length %}
{% set amount_guests = log.boat.amount_seats - amount_rowers %} {% set amount_guests = log.boat.amount_seats - amount_rowers %}
{% if amount_guests > 0 %} {% if amount_guests > 0 and not log.boat.external %}
Gäste Gäste
<small class="text-gray-600">(ohne Account)</small>: <small class="text-gray-600">(ohne Account)</small>:
{{ amount_guests }} {{ amount_guests }}