From 541ff3aa2123a8c8251c75c73152cd3ac474922a Mon Sep 17 00:00:00 2001
From: Walter Lorenzetti <lorenzetti@gis3w.it>
Date: Tue, 21 Jan 2025 14:37:59 +0100
Subject: [PATCH] Fix update user data (#1016)

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
---
 .../layout/prepended_appended_text.html       | 24 +++++++++++++++++++
 g3w-admin/usersmanage/forms.py                |  6 +++++
 2 files changed, 30 insertions(+)
 create mode 100644 g3w-admin/templates/bootstrap3/layout/prepended_appended_text.html

diff --git a/g3w-admin/templates/bootstrap3/layout/prepended_appended_text.html b/g3w-admin/templates/bootstrap3/layout/prepended_appended_text.html
new file mode 100644
index 000000000..6a885f928
--- /dev/null
+++ b/g3w-admin/templates/bootstrap3/layout/prepended_appended_text.html
@@ -0,0 +1,24 @@
+{% load crispy_forms_field %}
+
+{% if field.is_hidden %}
+    {{ field }}
+{% else %}
+    <div id="div_{{ field.auto_id }}" class="form-group{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if form_show_errors and field.errors %} has-error{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
+
+        {% if field.label and form_show_labels %}
+            <label for="{{ field.id_for_label }}" class="control-label {{ label_class }}{% if field.field.required %} requiredField{% endif %}">
+                {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+            </label>
+        {% endif %}
+
+        <div class="controls {{ field_class }}">
+            <div class="input-group">
+                {% if crispy_prepended_text %}<span class="input-group-addon{% if active %} active{% endif %}{% if input_size %} {{ input_size }}{% endif %}">{{ crispy_prepended_text|safe }}</span>{% endif %}
+                {% crispy_field field 'class' 'form-control' %}
+                {% if crispy_appended_text %}<span class="input-group-addon{% if active %} active{% endif %}{% if input_size %} {{ input_size }}{% endif %}">{{ crispy_appended_text|safe }}</span>{% endif %}
+            </div>
+
+            {% include 'bootstrap3/layout/help_text_and_errors.html' %}
+        </div>
+    </div>
+{% endif %}
diff --git a/g3w-admin/usersmanage/forms.py b/g3w-admin/usersmanage/forms.py
index 40e1ce212..a9a40ef67 100644
--- a/g3w-admin/usersmanage/forms.py
+++ b/g3w-admin/usersmanage/forms.py
@@ -724,6 +724,12 @@ class G3WUserUpdateForm(G3WUserForm):
 
     password = ReadOnlyPasswordHashField()
 
+    def clean_username(self):
+        """Reject usernames that differ only in case."""
+        username = self.cleaned_data.get("username")
+
+        return username
+
     def clean_password(self):
         return self.initial['password']