[Erp5-report] r7344 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

[nobody at svn.erp5.org]

Author: chris
Date: Thu May 18 14:15:16 2006
New Revision: 7344

URL: http://svn.erp5.org?rev=7344&view=rev
Log:
- added function that returns preferred username and current username if not set

Modified:
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=7344&r1=7343&r2=7344&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Thu May 18 14:15:16 2006
@@ -539,6 +539,15 @@
     # Decode login information.
     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)