From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 30 May 2019 18:59:37 +0000 (+0100)
Subject: people: Add nickname
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6e57f733dc3d6b7fd7c648bf6b8d7994d822d03;p=ipfire.org.git

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 35d4b59b..1e586fc5 100644
--- 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 71ceefc8..0fe6cf9e 100644
--- 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 db9ae164..3d30008f 100644
--- 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 8f5fa508..28e548c0 100644
--- 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 4b82fb67..581ba120 100644
--- 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)