Merge pull request 'fix-user' (#1193 ) from fix-user into staging

Reviewed-on: #1193
Merge pull request 'user merging should only be done by admins' (#1182 ) from user-upd into staging
2026-03-16 10:00:56 +01:00 · 2026-01-08 20:23:08 +01:00 · 2026-01-08 20:15:41 +01:00 · 2026-01-05 13:09:12 +01:00 · 2026-01-03 22:11:55 +01:00 · 2026-01-03 21:49:14 +01:00
1 changed files with 0 additions and 11 deletions
--- a/templates/admin/user/view.html.tera
+++ b/templates/admin/user/view.html.tera
@@ -230,17 +230,6 @@
                                </a>
                            </div>
                        {% endif %}
                    {% elif "NoMembership" in member %}
                        {% if allowed_to_edit %}
                            <div class="grid pt-3">
                                <a href="/admin/user/{{ user.id }}/delete"
                                   class="btn btn-alert"
                                   onclick="return confirm('Willst du die Daten von {{ user.name }} wirklich löschen?');">
                                    {% include "includes/delete-icon" %}
                                    Daten löschen
                                </a>
                            </div>
                        {% endif %}
                    {% endif %}
                    {% if "Scheckbuch" in member or "Schnupperant" in member or "NoMembership" in member %}
                        {% if allowed_to_edit %}
Author	SHA1	Message	Date
philipp	de357c3db3	Merge pull request 'fix-user' (#1193 ) from fix-user into staging Some checks failed CI/CD Pipeline / test (push) Failing after 29m32s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Update Cargo Dependencies / update-dependencies (push) Successful in 2m14s Details Reviewed-on: #1193	2026-03-16 10:00:56 +01:00
philipp	b2157a31c5	Merge pull request 'user merging should only be done by admins' (#1182 ) from user-upd into staging All checks were successful CI/CD Pipeline / test (push) Successful in 17m44s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m57s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Update Cargo Dependencies / update-dependencies (push) Successful in 1m43s Details Reviewed-on: #1182	2026-01-08 20:23:08 +01:00
philipp	bfb3ae4b6e	Merge pull request 'user-upd' (#1180 ) from user-upd into staging Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details Reviewed-on: #1180	2026-01-08 20:15:41 +01:00
philipp	88a3e5f2d0	Merge pull request 'Merge pull request 'force an action on important notifications' (#1177 ) from force-action-on-important-notifications into main' (#1178 ) from new-sort-option into staging All checks were successful CI/CD Pipeline / test (push) Successful in 17m44s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m49s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #1178	2026-01-05 13:09:12 +01:00
philipp	32c250536d	Merge pull request 'force-action-on-important-notifications' (#1176 ) from force-action-on-important-notifications into staging All checks were successful CI/CD Pipeline / test (push) Successful in 17m51s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m56s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #1176	2026-01-03 22:11:55 +01:00
philipp	b9d0e2a2dc	Merge pull request 'show-full-stats' (#1172 ) from show-full-stats into staging Some checks failed CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details CI/CD Pipeline / test (push) Has been cancelled Details Reviewed-on: #1172	2026-01-03 21:49:14 +01:00
philipp	b597898bdf	Merge pull request 'manual-deploy' (#1174 ) from manual-deploy into staging Some checks failed CI/CD Pipeline / test (push) Has been cancelled Details CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details Reviewed-on: #1174	2026-01-03 21:43:02 +01:00
philipp	e90555214a	Merge pull request 'No need to pay for deleted boats' (#1169 ) from handle-deleted-boats into staging All checks were successful CI/CD Pipeline / test (push) Successful in 19m20s Details CI/CD Pipeline / deploy-staging (push) Successful in 26m29s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #1169	2026-01-03 14:04:39 +01:00