diff --git a/src/account_manager/forms.py b/src/account_manager/forms.py index 960188a..b004730 100644 --- a/src/account_manager/forms.py +++ b/src/account_manager/forms.py @@ -26,8 +26,8 @@ class UpdateLDAPUserForm(forms.Form): email = forms.EmailField(label='E-Mail') first_name = forms.CharField(label='Vorname', required=True) last_name = forms.CharField(label='Nachname', required=True) - # phone = forms.(db_column='telephoneNumber', blank=True) - # mobile_phone = forms.CharField(db_column='mobile', blank=True) + phone = forms.CharField(label='Festnetz', required=False) + mobile_phone = forms.CharField(label='Mobiltelefon', required=False) # photo = forms.ImageField(label='Profilfoto', required=False) diff --git a/src/account_manager/models.py b/src/account_manager/models.py index d1bf544..2cb304b 100644 --- a/src/account_manager/models.py +++ b/src/account_manager/models.py @@ -33,7 +33,8 @@ class LdapUser(Model): email = ldap_fields.CharField(db_column='mail') phone = ldap_fields.CharField(db_column='telephoneNumber', blank=True) mobile_phone = ldap_fields.CharField(db_column='mobile', blank=True) - photo = ldap_fields.ImageField(db_column='jpegPhoto') + photo = ldap_fields.ImageField(db_column='photo') + # photo = ldap_fields.ImageField(db_column='jpegPhoto') def __str__(self): return self.username diff --git a/src/account_manager/views/user_views.py b/src/account_manager/views/user_views.py index b3d96a9..3fa8f41 100644 --- a/src/account_manager/views/user_views.py +++ b/src/account_manager/views/user_views.py @@ -135,7 +135,6 @@ def realm_user_update(request, realm_id, user_dn): form_class=AdminUpdateLDAPUserForm, form_attrs=[ {'model_field': 'username', 'form_field': 'username'}, - {'model_field': 'password', 'form_field': 'password'}, {'model_field': 'first_name', 'form_field': 'first_name'}, {'model_field': 'last_name', 'form_field': 'last_name'}, {'model_field': 'email', 'form_field': 'email'}, ]) @@ -301,7 +300,9 @@ def user_update(request, realm_id, user_dn): form_attrs=[ {'model_field': 'first_name', 'form_field': 'first_name'}, {'model_field': 'last_name', 'form_field': 'last_name'}, - {'model_field': 'email', 'form_field': 'email'}, ]) + {'model_field': 'email', 'form_field': 'email'}, + {'model_field': 'phone', 'form_field': 'phone'}, + {'model_field': 'mobile_phone', 'form_field': 'mobile_phone'}, ]) else: return redirect('permission-denied') @@ -414,15 +415,17 @@ def user_update_controller(request, realm, ldap_user, redirect_name, update_view form = form_class(request.POST) if form.is_valid(): for form_attr in form_attrs: - if form.cleaned_data[form_attr['form_field']]: - ldap_user.__setattr__(form_attr['model_field'], form.cleaned_data[form_attr['form_field']]) + # if form.cleaned_data[form_attr['form_field']]: + logger.info(form.cleaned_data[form_attr['form_field']]) + ldap_user.__setattr__(form_attr['model_field'], form.cleaned_data[form_attr['form_field']]) ldap_user.display_name = f'{form.cleaned_data["first_name"]} {form.cleaned_data["last_name"]}' - logger.debug(ldap_user.display_name) + logger.debug(form.data) ldap_user.save() return redirect(redirect_name, realm.id, ldap_user.dn) else: form_data = {'username': ldap_user.username, 'first_name': ldap_user.first_name, - 'last_name': ldap_user.last_name, 'email': ldap_user.email} + 'last_name': ldap_user.last_name, 'email': ldap_user.email, 'phone': ldap_user.phone, + 'mobile_phone': ldap_user.mobile_phone} form = form_class(initial=form_data) return render(request, update_view, {'form': form, 'realm': realm, 'user': ldap_user}) diff --git a/src/core/docker_settings.py b/src/core/docker_settings.py index bac2a9c..01f630e 100644 --- a/src/core/docker_settings.py +++ b/src/core/docker_settings.py @@ -134,6 +134,9 @@ STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'static'), ) +MEDIA_URL = '/media/' +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') + ######################################################################################################################## # LDAP Config # ######################################################################################################################## diff --git a/src/templates/macros/utils_macros.jinja2 b/src/templates/macros/utils_macros.jinja2 index 7fffb86..ff3644f 100644 --- a/src/templates/macros/utils_macros.jinja2 +++ b/src/templates/macros/utils_macros.jinja2 @@ -104,7 +104,7 @@ {{ realm_wrapper.user_count }} {{ realm_wrapper.group_count }} - :wq + {% endfor %} diff --git a/src/templates/user/realm_user_detail.jinja2 b/src/templates/user/realm_user_detail.jinja2 index e1ea901..ed52e2a 100644 --- a/src/templates/user/realm_user_detail.jinja2 +++ b/src/templates/user/realm_user_detail.jinja2 @@ -51,7 +51,6 @@ {{ mform.text_input(form.username) }} {{ mform.email_input(form.email) }} - {{ mform.password_input(form.password) }} {{ mform.text_input(form.first_name) }} {{ mform.text_input(form.last_name) }}
diff --git a/src/templates/user/user_detail.jinja2 b/src/templates/user/user_detail.jinja2 index b01e751..a702949 100644 --- a/src/templates/user/user_detail.jinja2 +++ b/src/templates/user/user_detail.jinja2 @@ -43,11 +43,13 @@ {% else %}

Nutzerdetails anpassen

-
+ {{ mform.email_input(form.email) }} {{ mform.text_input(form.first_name) }} {{ mform.text_input(form.last_name) }} + {{ mform.text_input(form.phone) }} + {{ mform.text_input(form.mobile_phone) }}