diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index f61afe04f..310cbf04c 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -93,10 +93,12 @@ - {% if user != request_user and not user.is_superuser %} + {% if user != request_user %} + {% endif %} + {% if user != request_user and not user.is_superuser %} diff --git a/openslides/participant/templates/participant/personal_info_widget.html b/openslides/participant/templates/participant/personal_info_widget.html index 260469b59..c9e405552 100644 --- a/openslides/participant/templates/participant/personal_info_widget.html +++ b/openslides/participant/templates/participant/personal_info_widget.html @@ -14,7 +14,7 @@ {% endif %} {% empty %} -
  • {% trans "None" %}
  • +
  • {% trans "None" %}
  • {% endfor %} @@ -33,7 +33,7 @@ {% endif %} {% empty %} -
  • {% trans "None" %}
  • +
  • {% trans "None" %}
  • {% endfor %} {% endif %} @@ -44,6 +44,6 @@ {% for assignment in assignments %}
  • {{ assignment }}
  • {% empty %} -
  • {% trans "None" %}
  • +
  • {% trans "None" %}
  • {% endfor %} diff --git a/openslides/participant/views.py b/openslides/participant/views.py index a055beefb..5b1097295 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -208,8 +208,6 @@ class UserDeleteView(DeleteView): def pre_redirect(self, request, *args, **kwargs): if self.get_object() == self.request.user: messages.error(request, _("You can not delete yourself.")) - elif self.get_object().is_superuser: - messages.error(request, _("You can not delete the administrator.")) else: super(DeleteView, self).pre_redirect(request, *args, **kwargs) diff --git a/openslides/projector/templates/projector/static_info_widget.html b/openslides/projector/templates/projector/static_info_widget.html deleted file mode 100644 index b99a5cbd9..000000000 --- a/openslides/projector/templates/projector/static_info_widget.html +++ /dev/null @@ -1 +0,0 @@ -{{ welcometext|safe|linebreaks }}