From 92980bc26e0e814930c207a7c1b8de97968d5d64 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 15 May 2013 17:38:50 +0200
Subject: [PATCH] Stay consistent with default getTitle.
Return empty string instead of None as default value.
---
master/bt5/slapos_cloud/DocumentTemplateItem/Person.py | 2 +-
.../slapos_cloud/TestTemplateItem/testSlapOSCloudDocument.py | 2 +-
master/bt5/slapos_cloud/bt/revision | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/master/bt5/slapos_cloud/DocumentTemplateItem/Person.py b/master/bt5/slapos_cloud/DocumentTemplateItem/Person.py
index 6bc3267d9..a44fd7386 100644
--- a/master/bt5/slapos_cloud/DocumentTemplateItem/Person.py
+++ b/master/bt5/slapos_cloud/DocumentTemplateItem/Person.py
@@ -48,6 +48,6 @@ class Person(ERP5Person):
title = ERP5Person.getTitle(self, **kw)
test_title = title.replace(' ', '')
if test_title == '':
- return self.getDefaultEmailCoordinateText()
+ return self.getDefaultEmailCoordinateText(test_title)
else:
return title
diff --git a/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudDocument.py b/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudDocument.py
index 24928fb4c..715e22215 100644
--- a/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudDocument.py
+++ b/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudDocument.py
@@ -14,7 +14,7 @@ class TestSlapOSPersonDocument(testSlapOSMixin):
portal_type="Person")
# Default title is empty
- self.assertEquals(person.getTitle(), None)
+ self.assertEquals(person.getTitle(), "")
# If not title, the email is used
person.edit(default_email_coordinate_text="foo@example.org")
diff --git a/master/bt5/slapos_cloud/bt/revision b/master/bt5/slapos_cloud/bt/revision
index 2989c6c76..fefb598af 100644
--- a/master/bt5/slapos_cloud/bt/revision
+++ b/master/bt5/slapos_cloud/bt/revision
@@ -1 +1 @@
-283
\ No newline at end of file
+284
\ No newline at end of file
--
2.30.9