mgoetz/ldap_account_manager
Archived
2
2
Fork 0
Code Issues 9 Pull Requests Releases 2 Wiki Activity

Add displayName creation/

Browse Source
This commit is contained in:
Götz 2019-05-02 14:19:58 +02:00
parent fe70dbc002
commit f5aa8308bc
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/account_manager/models.py
View File

@ -30,6 +30,7 @@ class LdapUser(Model):
# inetOrgPerson # inetOrgPerson
username = ldap_fields.CharField(db_column='uid', primary_key=True) username = ldap_fields.CharField(db_column='uid', primary_key=True)
display_name = ldap_fields.CharField(db_column='displayName', blank=True)
password = ldap_fields.CharField(db_column='userPassword') password = ldap_fields.CharField(db_column='userPassword')
first_name = ldap_fields.CharField(db_column='cn', blank=True) first_name = ldap_fields.CharField(db_column='cn', blank=True)
last_name = ldap_fields.CharField(db_column='sn', blank=True) last_name = ldap_fields.CharField(db_column='sn', blank=True)

7
src/account_manager/views/user_views.py
View File

@ -26,7 +26,8 @@ def protect_cross_realm_user_access(view_func):
if realm_id and user_dn and Realm.objects.get(id=realm_id).ldap_base_dn not in user_dn: if realm_id and user_dn and Realm.objects.get(id=realm_id).ldap_base_dn not in user_dn:
return render(request, 'permission_denied.jinja2', return render(request, 'permission_denied.jinja2',
{ {
'extra_errors': _('Der angefragte Nutzer gehört einem anderen Bereich an. Nutzer können nur von dem Bereich bearbeitet werden, in dem sie erstellt wurden.')}, 'extra_errors': _(
'Der angefragte Nutzer gehört einem anderen Bereich an. Nutzer können nur von dem Bereich bearbeitet werden, in dem sie erstellt wurden.')},
status=404) status=404)
return view_func(request, *args, **kwargs) return view_func(request, *args, **kwargs)
@ -365,7 +366,9 @@ def user_update_controller(request, realm, ldap_user, redirect_name, update_view
for form_attr in form_attrs: for form_attr in form_attrs:
if form.cleaned_data[form_attr['form_field']]: if form.cleaned_data[form_attr['form_field']]:
ldap_user.__setattr__(form_attr['model_field'], form.cleaned_data[form_attr['form_field']]) ldap_user.__setattr__(form_attr['model_field'], form.cleaned_data[form_attr['form_field']])
ldap_user.save() ldap_user.display_name = f'{form.cleaned_data["first_name"]} {form.cleaned_data["last_name"]}'
logger.debug(ldap_user.display_name)
ldap_user.save()
return redirect(redirect_name, realm.id, ldap_user.dn) return redirect(redirect_name, realm.id, ldap_user.dn)
else: else:
form_data = {'username': ldap_user.username, 'first_name': ldap_user.first_name, form_data = {'username': ldap_user.username, 'first_name': ldap_user.first_name,

14
src/templates/user/realm_user_detail.jinja2
View File

@ -6,13 +6,19 @@
{% if not form %} {% if not form %}
<ul class="list-group list-group-flush w-100"> <ul class="list-group list-group-flush w-100">
<li class="list-group-item">Ldap Domain: {{ user.dn }}</li> <li class="list-group-item">Ldap Domain: {{ user.dn }}</li>
{# <li class="list-group-item">Nutzername: {{ user.username }}</li>#} <li class="list-group-item"> Anzeigename:
{% if user.display_name %}
{{ user.display_name }}
{% else %}
<span class="text-warning"> Noch nicht generiert </span>
{% endif %}
</li>
<li class="list-group-item">Vorname: {{ user.first_name }}</li> <li class="list-group-item">Vorname: {{ user.first_name }}</li>
<li class="list-group-item">Nachname: {{ user.last_name }}</li> <li class="list-group-item">Nachname: {{ user.last_name }}</li>
<li class="list-group-item">Email: {{ user.email }}</li> <li class="list-group-item">Email: {{ user.email }}</li>
{# <li class="list-group-item">Passwort: {{ user.password }}</li>#} {# <li class="list-group-item">Passwort: {{ user.password }}</li>#}
{# <li class="list-group-item">Telefon: {{ user.phone }}</li>#} {# <li class="list-group-item">Telefon: {{ user.phone }}</li>#}
{# <li class="list-group-item">Mobiltelefon: {{ user.mobile_phone }}</li>#} {# <li class="list-group-item">Mobiltelefon: {{ user.mobile_phone }}</li>#}
<li class="list-group-item">Gruppen: <li class="list-group-item">Gruppen:
{% if groups %} {% if groups %}
{% for group in groups %} {% for group in groups %}