Merge pull request 'fix-boatdamage' (#123 ) from fix-boatdamage into main

Reviewed-on: #123
fix boat damage show
2024-01-01 18:55:37 +01:00 · 2024-01-01 18:54:44 +01:00 · 2024-01-01 17:53:31 +01:00 · 2024-01-01 17:51:45 +01:00 · 2024-01-01 17:26:00 +01:00
2 changed files with 14 additions and 3 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1604,6 +1604,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

+[[package]]
+name = "openssl-src"
+version = "300.1.6+3.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.98"
@ -1612,6 +1621,7 @@ checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
 dependencies = [
 "cc",
 "libc",
+ "openssl-src",
 "pkg-config",
 "vcpkg",
 ]
@ -2130,6 +2140,7 @@ dependencies = [
 "ics",
 "lettre",
 "log",
+ "openssl",
 "rocket",
 "rocket_dyn_templates",
 "serde",
--- a/templates/boatdamages.html.tera
+++ b/templates/boatdamages.html.tera
@ -57,10 +57,10 @@
        {% if boatdamage.fixed_at %}
          <small class="block text-gray-600 dark:text-gray-100">Repariert von {{ boatdamage.user_fixed.name }} am/um {{ boatdamage.fixed_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
        {% else %}
-          {% if "cox" in loggedin_user.roles %}
+          {% if loggedin_user and "cox" in loggedin_user.roles %}
            <form action="/boatdamage/{{ boatdamage.id }}/fixed" method="post" class="flex justify-between mt-3">
              <input type="text" name="desc" value="{{ boatdamage.desc }}" class="grow input rounded-s" />
-              {% if "tech" in loggedin_user.roles %}
+              {% if loggedin_user and "tech" in loggedin_user.roles %}
                <input type="submit" class="btn btn-primary" style="border-top-left-radius: 0; border-bottom-left-radius: 0;" value="Repariert und verifiziert" />
              {% else %}
                <input type="submit" class="btn btn-primary" style="border-top-left-radius: 0; border-bottom-left-radius: 0;" value="Repariert" />
@ -72,7 +72,7 @@
        {% if boatdamage.verified_at %}
          <small class="block text-gray-600 dark:text-gray-100">Verifziert von {{ boatdamage.user_verified.name }} am/um {{ boatdamage.verified_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
        {% else %}
-          {% if "tech" in loggedin_user.roles and boatdamage.fixed_at  %}
+          {% if loggedin_user and "tech" in loggedin_user.roles and boatdamage.fixed_at  %}
            <form action="/boatdamage/{{ boatdamage.id }}/verified" method="post" class="flex justify-between mt-3">
              <input type="text" name="desc" value="{{ boatdamage.desc }}" class="grow input rounded-s"/>
              <input type="submit" class="btn btn-dark" style="border-top-left-radius: 0; border-bottom-left-radius: 0;"  value="Verifiziert" />
Author	SHA1	Message	Date
philipp	cade5e1dfc	Merge pull request 'fix-boatdamage' (#123 ) from fix-boatdamage into main All checks were successful CI/CD Pipeline / test (push) Successful in 15m8s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 17m46s Details Reviewed-on: #123	2024-01-01 18:55:37 +01:00
philipp	e925fadbb8	fix boat damage show All checks were successful CI/CD Pipeline / test (push) Successful in 15m6s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-01-01 18:54:44 +01:00
philipp	945b96c55d	Merge pull request 'push' (#121 ) from fix into staging All checks were successful CI/CD Pipeline / test (push) Successful in 15m51s Details CI/CD Pipeline / deploy-staging (push) Successful in 18m21s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #121	2024-01-01 17:53:31 +01:00
philipp	d1420961a0	Merge pull request 'push' (#120 ) from fix into staging Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details Reviewed-on: #120	2024-01-01 17:51:45 +01:00
philipp	b916b9783b	Merge pull request 'fix ci' (#118 ) from fix into staging Some checks failed CI/CD Pipeline / test (push) Successful in 11m45s Details CI/CD Pipeline / deploy-staging (push) Failing after 5m45s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #118	2024-01-01 17:26:00 +01:00