use getId() instead of getUserName() where user is supposed to be neither...

use getId() instead of getUserName() where user is supposed to be neither Anonyous User nor System Processes.

use getId() instead of getUserName() where user is supposed to be neither...
use getId() instead of getUserName() where user is supposed to be neither Anonyous User nor System Processes.
b0113856 · Kazuhiko Shiozaki · Vincent Pelletier · a20b4e4b · b0113856 · b0113856
Commit b0113856 authored Oct 27, 2016 by Kazuhiko Shiozaki Committed by Vincent Pelletier Dec 23, 2016
18 changed files
--- a/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashToCurrencyPurchaseLine_getBaobabDestination.py
+++ b/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/IncomingCashToCurrencyPurchaseLine_getBaobabDestination.py
@@ -6,7 +6,7 @@ return destination


 # OLD METHOD user logged in
-#user_id = context.portal_membership.getAuthenticatedMember().getUserName()
+#user_id = context.portal_membership.getAuthenticatedMember().getId()

 # NEW METHOD must use owner to know site letter
 old_group_list = context.get_local_roles()

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.py
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/scripts/validateVaultBalance.py
@@ -14,7 +14,7 @@ resource = transaction.CashDelivery_checkCounterInventory(source = destination,
 #if len(vliste) != 0:
 #  raise ValidationFailed, (vliste[0].getMessage(),)

-user_id = transaction.portal_membership.getAuthenticatedMember().getUserName()
+user_id = transaction.portal_membership.getAuthenticatedMember().getId()
 site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)
 # context.log('validateVaultBalance site_list',site_list)
 destination = transaction.getDestination()

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateVaultBalance.py
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateVaultBalance.py
@@ -5,7 +5,7 @@ transaction = state_change['object']
 # Compute the source form the vault choosen by
 # the accountant and find the counter with the
 # user logged in
-user_id = transaction.portal_membership.getAuthenticatedMember().getUserName()
+user_id = transaction.portal_membership.getAuthenticatedMember().getId()
 site_list = context.Baobab_getUserAssignedSiteList(user_id=user_id)
 # context.log('validateVaultBalance site_list',site_list)
 source = transaction.getSource()

--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.py
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.py
@@ -3,7 +3,7 @@
 from Products.ERP5Type.Cache import CachingMethod

 if user_id is None:
-  user_id = context.portal_membership.getAuthenticatedMember().getUserName()
+  user_id = context.portal_membership.getAuthenticatedMember().getId()

 def getFunctionList(user_id=user_id):


--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedGroupList.py
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedGroupList.py
@@ -3,7 +3,7 @@
 from Products.ERP5Type.Cache import CachingMethod

 if user_id is None:
-  user_id = context.portal_membership.getAuthenticatedMember().getUserName()
+  user_id = context.portal_membership.getAuthenticatedMember().getId()

 def getGroupList(user_id=user_id):


--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.py
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.py
@@ -3,7 +3,7 @@
 from Products.ERP5Type.Cache import CachingMethod

 if user_id is None:
-  user_id = context.portal_membership.getAuthenticatedMember().getUserName()
+  user_id = context.portal_membership.getAuthenticatedMember().getId()

 def getSiteList(user_id=user_id):


--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.py
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.py
 from Products.ERP5Type.Cache import CachingMethod

-user_id = context.portal_membership.getAuthenticatedMember().getUserName()
+user_id = context.portal_membership.getAuthenticatedMember().getId()

 def getUserSiteUid(user_id):
  return context.Baobab_getUserAssignedRootSite(user_id=user_id, object=1).getSiteUid()

--- a/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/Base_mainConfiguratorTemplate.zpt
+++ b/bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/Base_mainConfiguratorTemplate.zpt
 <tal:block tal:condition="python: options.get('current_state') is None">
  <div id="logged_in_as">
    Hello, <tal:block tal:condition="not: here/portal_membership/isAnonymousUser">
-             <span tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()" />
+             <span tal:replace="python:here.portal_membership.getAuthenticatedMember().getId()" />
           </tal:block>
  </div>
  <tal:block tal:replace="structure python: options.get('form_html')" /> 

--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewStatusBarRenderer.zpt
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewStatusBarRenderer.zpt
@@ -6,7 +6,7 @@
    <tal:block tal:condition="not: here/portal_membership/isAnonymousUser">
      <span class="logged_txt"><tal:block i18n:translate=""
        i18n:domain="ui">User</tal:block> :</span><span class="login">
-        <tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()" />
+        <tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getId()" />
      </span>
    </tal:block>
    <!--<tal:block tal:condition="here/portal_membership/isAnonymousUser">

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewNavigationMenuWidget.zpt
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewNavigationMenuWidget.zpt
@@ -67,7 +67,7 @@
    <ul>
      <li><a href="#" i18n:translate="" i18n:domain="ui"
             tal:condition="not:is_anonymous"
-             tal:attributes="href python:'%s/person_module/view?reset:int=1&owner=%s' % (portal_path, here.portal_membership.getAuthenticatedMember().getUserName())">My Contacts</a></li>
+             tal:attributes="href python:'%s/person_module/view?reset:int=1&owner=%s' % (portal_path, here.portal_membership.getAuthenticatedMember().getId())">My Contacts</a></li>
      <li><a href="#" i18n:translate="" i18n:domain="ui"
             tal:attributes="href string:${portal_path}/person_module/view?reset:int=1">Everybody</a></li>
    </ul>

--- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/index_html.zpt
+++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/index_html.zpt
@@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            <!--
            <tal:block tal:condition="not: here/portal_membership/isAnonymousUser">
              <span class="link2" i18n:translate="" i18n:domain="ui">of</span>
-              <span class="link2" tal:content="python:here.portal_catalog(reference=here.portal_membership.getAuthenticatedMember().getUserName(), portal_type='Person')[0].getObject().getTitle()+' :'" />
+              <span class="link2" tal:content="python:here.portal_catalog(reference=here.portal_membership.getAuthenticatedMember().getId(), portal_type='Person')[0].getObject().getTitle()+' :'" />
            </tal:block>
            -->
          </div>
@@ -134,7 +134,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            <span class="link2"></span>
            <tal:block tal:condition="not: here/portal_membership/isAnonymousUser">
              <span class="modu" i18n:translate="" i18n:domain="ui">Logged In as :</span>
-              <span class="link2" tal:content="python:here.portal_membership.getAuthenticatedMember().getUserName()" />
+              <span class="link2" tal:content="python:here.portal_membership.getAuthenticatedMember().getId()" />
            </tal:block>
            <span class="link2"></span>
          </div> -->

--- a/bt5/erp5_web_minimal_simplicity/SkinTemplateItem/portal_skins/erp5_web_minimal_simplicity/template_erp5_xhtml_style.zpt
+++ b/bt5/erp5_web_minimal_simplicity/SkinTemplateItem/portal_skins/erp5_web_minimal_simplicity/template_erp5_xhtml_style.zpt
@@ -104,7 +104,7 @@
                <div id="logged_in_as" class="logged_in_as">
                  <tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">
                    <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>
-                    <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />
+                    <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getId()" />
                  </tal:block>
                </div>
                <p class="clear"></p>

--- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewGlobalNavigationWidget.zpt
+++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewGlobalNavigationWidget.zpt
@@ -25,7 +25,7 @@
 <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">
 <li><a tal:attributes="href python:'%s/logout' % web_site_url">
    <tal:block i18n:translate="" i18n:domain="ui">Logout</tal:block>
-    (<tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getUserName()" />)</a></li>
+    (<tal:block tal:replace="python:here.portal_membership.getAuthenticatedMember().getId()" />)</a></li>
 </tal:block>
 </ul>
 </div>

--- a/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.zpt
+++ b/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.zpt
@@ -90,7 +90,7 @@ IDEAS:
                <div id="logged_in_as">
                  <tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">
                    <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>
-                    <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />
+                    <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getId()" />
                  </tal:block>
                </div>
 -->

--- a/bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_core/ERP5Site_renderBreadcrumb.zpt
+++ b/bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_core/ERP5Site_renderBreadcrumb.zpt
@@ -8,7 +8,7 @@
  <div id="logged_in_as" class="logged_in_as">
    <tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">
      <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>
-      <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />
+      <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getId()" />
    </tal:block>
  </div>


--- a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/Base_getUserRemoteBusinessConfigurationReferenceList.py
+++ b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/Base_getUserRemoteBusinessConfigurationReferenceList.py
@@ -4,7 +4,7 @@
 from Products.ERP5Type.Log import log

 portal = context.getPortalObject()
-reference = portal.portal_membership.getAuthenticatedMember().getUserName()
+reference = portal.portal_membership.getAuthenticatedMember().getId()
 kw = {'reference': reference}

 # XXX: This try except is used in case of connection refused

--- a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.zpt
+++ b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/navigation_box_render.zpt
@@ -84,7 +84,7 @@
     i18n:translate="" i18n:domain="ui">Login</a></span>

 <span id="tiologin"
-   tal:define="user_name python:here.portal_membership.getAuthenticatedMember().getUserName()"
+   tal:define="user_name python:here.portal_membership.getAuthenticatedMember().getId()"
   tal:condition="not:here/portal_membership/isAnonymousUser"><a href="#" id="link-login"  
     tal:attributes="href string:${context_url}/logout"
     i18n:translate="" i18n:domain="ui">Logout</a>

--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_auto_logout/logout.py
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_auto_logout/logout.py
 from AccessControl import getSecurityManager
 portal = context.getPortalObject()
-username = getSecurityManager().getUser().getUserName()
+username = getSecurityManager().getUser().getId()
 if username is not None:
  portal.portal_sessions.manage_delObjects(
    portal.Base_getAutoLogoutSessionKey(