people: Add nickname

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 35d4b59b5ea0915d6a8018248e8a0f4b332a91f6..1e586fc54eaf08423da7c9b923b2ba16abebd15e 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -262,6 +262,9 @@ class Account(Object):
                self.attributes = attrs or {}
 
        def __str__(self):
+               if self.nickname:
+                       return self.nickname
+
                return self.name
 
        def __repr__(self):
@@ -466,6 +469,16 @@ class Account(Object):
        def name(self):
                return self._get_string("cn")
 
+       # Nickname
+
+       def get_nickname(self):
+               return self._get_string("displayName")
+
+       def set_nickname(self, nickname):
+               self._set_string("displayName", nickname)
+
+       nickname = property(get_nickname, set_nickname)
+
        # First Name
 
        def get_first_name(self):

diff --git a/src/templates/base.html b/src/templates/base.html
index 71ceefc8a3db5d7f7951b7686ba2cfb486e56ece..0fe6cf9eebb0c566551153d3b7e7e54ca621780d 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -327,7 +327,7 @@
                                                        {% elif current_user %}
                                                                <p class="mb-0">
                                                                        <span class="mr-2">
-                                                                               {{ _("You are currently logged in as %s") % current_user.name }}
+                                                                               {{ _("You are currently logged in as %s") % current_user }}
                                                                        </span>
 
                                                                        <a href="/logout">{{ _("Logout") }}</a>

diff --git a/src/templates/people/base.html b/src/templates/people/base.html
index db9ae164fe6971d4e92d40e3d63d01c33e400bbb..3d30008fd46c43db4a5f372aa227ff8f23fe065b 100644 (file)
--- a/src/templates/people/base.html
+++ b/src/templates/people/base.html
@@ -9,7 +9,7 @@
                                <img class="img-fluid rounded-circle my-2" src="{{ account.avatar_url(512) }}" alt="{{ account }}" />
 
                                <h3 class="my-3">
-                                       <a class="text-white" href="/users/{{ account.uid }}">{{ account.name }}</a>
+                                       <a class="text-white" href="/users/{{ account.uid }}">{{ account }}</a>
                                </h3>
 
                                {% if account.has_sip() %}

diff --git a/src/templates/people/user-edit.html b/src/templates/people/user-edit.html
index 8f5fa5083eeee295a247865d66ace0b2020fc137..28e548c089eae4f064ff9be0e1d92ebdb62cf064 100644 (file)
--- a/src/templates/people/user-edit.html
+++ b/src/templates/people/user-edit.html
@@ -24,6 +24,13 @@
                        </div>
                </div>
 
+               <div class="form-group">
+                       <label>{{ _("Nickname") }} ({{ _("optional") }})</label>
+
+                       <input type="text" class="form-control" name="nickname"
+                               placeholder="{{ _("Nickname") }}" value="{{ account.nickname or "" }}">
+               </div>
+
                <div class="form-group">
                        <label>{{ _("Address") }}</label>
 

diff --git a/src/web/people.py b/src/web/people.py
index 4b82fb67bc2a399e8031076cbe9dc78105f88046..581ba12097d889b072032b46cd122943c99c89c9 100644 (file)
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -281,6 +281,7 @@ class UserEditHandler(auth.CacheMixin, base.BaseHandler):
                try:
                        account.first_name   = self.get_argument("first_name")
                        account.last_name    = self.get_argument("last_name")
+                       account.nickname     = self.get_argument("nickname", None)
                        account.street       = self.get_argument("street", None)
                        account.city         = self.get_argument("city", None)
                        account.postal_code  = self.get_argument("postal_code", None)