From fd3785743d7bd4659b1d1b1427994d4b3217757b Mon Sep 17 00:00:00 2001
From: Christophe Dumez <christophe@nexedi.com>
Date: Thu, 18 May 2006 12:15:16 +0000
Subject: [PATCH] - added function that returns preferred username and current
username if not set
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7344 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Subversion/Tool/SubversionTool.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py
index a2c3ed087d..320471dbb3 100644
--- a/product/ERP5Subversion/Tool/SubversionTool.py
+++ b/product/ERP5Subversion/Tool/SubversionTool.py
@@ -540,6 +540,15 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
trust_item_list, permanent = loads(b64decode(trust))
return dict(trust_item_list), permanent
+ def getPreferredUsername(self):
+ """return username in preferences if set of the current username
+ """
+ username = self.getPortalObject().portal_preferences.getPreferredSubversionUserName()
+ if username is None or username.strip() == "":
+ # not set in preferences, then we get the current username in zope
+ username = self.portal_membership.getAuthenticatedMember().getUserName()
+ return username
+
def diffHTML(self, file_path, bt, revision1=None, revision2=None):
raw_diff = self.diff(file_path, bt, revision1, revision2)
return DiffFile(raw_diff).toHTML()
--
2.30.9