Merge pull request #1142 from freedomofpress/journalist-initials-in-r…

…eply add sender badge in replies
freedomofpress · Oct 13, 2020 · 9bfbff3 · 9bfbff3
2 parents c36d2ff + 882024d
commit 9bfbff3
Show file tree

Hide file tree

Showing 17 changed files with 1,013 additions and 270 deletions.
diff --git a/securedrop_client/db.py b/securedrop_client/db.py
@@ -461,8 +461,14 @@ class User(Base):
     def __repr__(self) -> str:
         return "<Journalist {}: {}>".format(self.uuid, self.username)
 
+    @property
+    def deleted(self) -> bool:
+        return True if self.uuid == "deleted" else False
+
     @property
     def fullname(self) -> str:
+        if self.deleted:
+            return ""
         if self.firstname and self.lastname:
             return self.firstname + " " + self.lastname
         elif self.firstname:
@@ -474,6 +480,8 @@ def fullname(self) -> str:
 
     @property
     def initials(self) -> str:
+        if self.deleted:
+            return ""
         if self.firstname and self.lastname:
             return self.firstname[0].lower() + self.lastname[0].lower()
         elif self.firstname and len(self.firstname) >= 2: