Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mikolaï Krol
erp5
Commits
a20b4e4b
Commit
a20b4e4b
authored
Oct 27, 2016
by
Kazuhiko Shiozaki
Committed by
Vincent Pelletier
Dec 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use getIdOrUserName() instead of getUserName().
parent
0eed9896
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
18 additions
and
18 deletions
+18
-18
bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/Document_getPropertiesAsJSON.py
...portal_skins/cloudooo_web/Document_getPropertiesAsJSON.py
+1
-1
bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/WebSection_redirectUser.py
...Item/portal_skins/cloudooo_web/WebSection_redirectUser.py
+1
-1
bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_profitandloss_pdf_template.zpt
...ccountingTransactionModule_profitandloss_pdf_template.zpt
+1
-1
bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py
...components/test.erp5.testRunMyDocConfigurationWorkflow.py
+1
-1
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_checkUserIsAPersonOrOrganisation.py
..._skins/erp5_egov/EGov_checkUserIsAPersonOrOrganisation.py
+1
-1
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getUserDocumentRelativeUrl.py
...portal_skins/erp5_egov/EGov_getUserDocumentRelativeUrl.py
+1
-1
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getUserDocumentUrl.py
...ateItem/portal_skins/erp5_egov/EGov_getUserDocumentUrl.py
+1
-1
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/ArchivedApplication_listMethod.py
...rp5_egov_widget_library/ArchivedApplication_listMethod.py
+1
-1
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/MyDocuments_listMethod.py
..._skins/erp5_egov_widget_library/MyDocuments_listMethod.py
+1
-1
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/PendingApplication_listMethod.py
...erp5_egov_widget_library/PendingApplication_listMethod.py
+1
-1
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox.xml
...skins/erp5_km_theme/WebSite_viewMyContentList/listbox.xml
+1
-1
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/ERP5RunMyDocs_acquireSession.py
...tal_skins/erp5_run_my_doc/ERP5RunMyDocs_acquireSession.py
+1
-1
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_generateFilename.py
.../portal_skins/erp5_ui_test_core/Zuite_generateFilename.py
+1
-1
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.py
...web_widget_library/WebSection_getToolbarModuleItemList.py
+1
-1
bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_core/ERP5Site_renderNavigationBox.py
...ns/erp5_xhtml_gadget_core/ERP5Site_renderNavigationBox.py
+1
-1
product/ERP5/Extensions/CachePageTemplate.py
product/ERP5/Extensions/CachePageTemplate.py
+1
-1
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.py
...Item/portal_skins/erp5_core/ERP5Site_getModuleItemList.py
+1
-1
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_renderCachedNavigationBox.py
...ns/erp5_xhtml_style/ERP5Site_renderCachedNavigationBox.py
+1
-1
No files found.
bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/Document_getPropertiesAsJSON.py
View file @
a20b4e4b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
from
Products.ERP5Type.JSONEncoder
import
encodeInJson
as
dumps
from
Products.ERP5Type.JSONEncoder
import
encodeInJson
as
dumps
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
reference
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
reference
=
portal
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
processing
=
None
processing
=
None
if
reference
==
"Anonymous User"
:
if
reference
==
"Anonymous User"
:
...
...
bt5/cloudooo_web/SkinTemplateItem/portal_skins/cloudooo_web/WebSection_redirectUser.py
View file @
a20b4e4b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
member
=
portal
.
portal_membership
.
getAuthenticatedMember
()
member
=
portal
.
portal_membership
.
getAuthenticatedMember
()
reference
=
member
.
getUserName
()
reference
=
member
.
get
IdOr
UserName
()
if
reference
==
"Anonymous User"
:
if
reference
==
"Anonymous User"
:
return
context
.
WebSection_viewUploadFileDialog
()
return
context
.
WebSection_viewUploadFileDialog
()
else
:
else
:
...
...
bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_profitandloss_pdf_template.zpt
View file @
a20b4e4b
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<pagetemplate
startframe=
'content'
id=
'FirstPage'
>
<pagetemplate
startframe=
'content'
id=
'FirstPage'
>
<static>
<static>
<infostring
align=
"left"
x=
"1cm"
y=
"29cm"
size=
"8"
font=
"Helvetica"
color=
"(0,0,0)"
<infostring
align=
"left"
x=
"1cm"
y=
"29cm"
size=
"8"
font=
"Helvetica"
color=
"(0,0,0)"
tal:content=
"python: here.Base_translateString('ui', 'Printed by %(user)s at %(date)s') % {'user':user.getUserName(), 'date':DateTime()}"
>
Printed by
</infostring>
tal:content=
"python: here.Base_translateString('ui', 'Printed by %(user)s at %(date)s') % {'user':user.get
IdOr
UserName(), 'date':DateTime()}"
>
Printed by
</infostring>
<infostring
align=
"left"
x=
"18cm"
y=
"0.5cm"
size=
"10"
font=
"Helvetica"
color=
"(0,0,0)"
>
Page %(page)s
</infostring>
<infostring
align=
"left"
x=
"18cm"
y=
"0.5cm"
size=
"10"
font=
"Helvetica"
color=
"(0,0,0)"
>
Page %(page)s
</infostring>
</static>
</static>
<frame
showBoundary=
'0'
leftpadding=
'0.1cm'
height=
'23.94cm'
width=
'17.59cm'
rightpadding=
'0.1cm'
y=
'2cm'
x=
'2cm'
nextid=
'content'
toppadding=
'0.2cm'
id=
'content'
bottompadding=
'0.5cm'
/>
<frame
showBoundary=
'0'
leftpadding=
'0.1cm'
height=
'23.94cm'
width=
'17.59cm'
rightpadding=
'0.1cm'
y=
'2cm'
x=
'2cm'
nextid=
'content'
toppadding=
'0.2cm'
id=
'content'
bottompadding=
'0.5cm'
/>
...
...
bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py
View file @
a20b4e4b
...
@@ -207,7 +207,7 @@ class TestRunMyDocsConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
...
@@ -207,7 +207,7 @@ class TestRunMyDocsConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
""" Check if Knowledge Pad is configured correctly """
""" Check if Knowledge Pad is configured correctly """
self
.
portal
.
ERP5Site_createDefaultKnowledgePadListForUser
()
self
.
portal
.
ERP5Site_createDefaultKnowledgePadListForUser
()
self
.
tic
()
self
.
tic
()
current_user
=
self
.
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
current_user
=
self
.
portal
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
pad
=
self
.
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
"Knowledge Pad"
,
pad
=
self
.
portal
.
portal_catalog
.
getResultValue
(
portal_type
=
"Knowledge Pad"
,
owner
=
current_user
)
owner
=
current_user
)
gadget_uid
=
self
.
portal
.
portal_gadgets
.
test_wizard_gadget
.
getUid
()
gadget_uid
=
self
.
portal
.
portal_gadgets
.
test_wizard_gadget
.
getUid
()
...
...
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_checkUserIsAPersonOrOrganisation.py
View file @
a20b4e4b
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
person_or_organisation_list
=
portal
.
portal_catalog
(
\
person_or_organisation_list
=
portal
.
portal_catalog
(
\
portal_type
=
[
'Organisation'
,
'Person'
],
portal_type
=
[
'Organisation'
,
'Person'
],
...
...
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getUserDocumentRelativeUrl.py
View file @
a20b4e4b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
document_type_list
=
context
.
EGov_getAllowedFormTypeList
()
document_type_list
=
context
.
EGov_getAllowedFormTypeList
()
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
form_list
=
portal
.
portal_catalog
(
\
form_list
=
portal
.
portal_catalog
(
\
portal_type
=
document_type_list
,
portal_type
=
document_type_list
,
...
...
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getUserDocumentUrl.py
View file @
a20b4e4b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
document_type_list
=
context
.
EGov_getAllowedFormTypeList
()
document_type_list
=
context
.
EGov_getAllowedFormTypeList
()
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
form_list
=
portal
.
portal_catalog
(
\
form_list
=
portal
.
portal_catalog
(
\
portal_type
=
document_type_list
,
portal_type
=
document_type_list
,
...
...
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/ArchivedApplication_listMethod.py
View file @
a20b4e4b
...
@@ -3,7 +3,7 @@ portal_type_list = context.EGov_getAllowedFormTypeList()
...
@@ -3,7 +3,7 @@ portal_type_list = context.EGov_getAllowedFormTypeList()
validation_state_list
=
[
'archived'
,]
validation_state_list
=
[
'archived'
,]
# get user name
# get user name
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
if
not
kw
.
has_key
(
'portal_type'
):
if
not
kw
.
has_key
(
'portal_type'
):
kw
[
'portal_type'
]
=
portal_type_list
kw
[
'portal_type'
]
=
portal_type_list
...
...
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/MyDocuments_listMethod.py
View file @
a20b4e4b
# get user name
# get user name
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
if
not
kw
.
has_key
(
'portal_type'
):
if
not
kw
.
has_key
(
'portal_type'
):
kw
[
'portal_type'
]
=
context
.
getPortalDocumentTypeList
()
kw
[
'portal_type'
]
=
context
.
getPortalDocumentTypeList
()
...
...
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/PendingApplication_listMethod.py
View file @
a20b4e4b
...
@@ -4,7 +4,7 @@ if portal_type_list == ():
...
@@ -4,7 +4,7 @@ if portal_type_list == ():
return
[]
return
[]
# get portal_type_listuser name
# get portal_type_listuser name
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_name
=
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
if
not
kw
.
has_key
(
'portal_type'
):
if
not
kw
.
has_key
(
'portal_type'
):
kw
[
'portal_type'
]
=
portal_type_list
kw
[
'portal_type'
]
=
portal_type_list
...
...
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox.xml
View file @
a20b4e4b
...
@@ -165,7 +165,7 @@
...
@@ -165,7 +165,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
_text
</string>
</key>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:((\'owner\', here.portal_membership.getAuthenticatedMember().getUserName()), (\'validation_state\', ()), (\'all_versions\', 1))
</string>
</value>
<value>
<string>
python:((\'owner\', here.portal_membership.getAuthenticatedMember().get
IdOr
UserName()), (\'validation_state\', ()), (\'all_versions\', 1))
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
bt5/erp5_run_my_doc/SkinTemplateItem/portal_skins/erp5_run_my_doc/ERP5RunMyDocs_acquireSession.py
View file @
a20b4e4b
...
@@ -8,7 +8,7 @@ expire_timeout_days = 90
...
@@ -8,7 +8,7 @@ expire_timeout_days = 90
session_id
=
request
.
get
(
'session_id'
,
None
)
session_id
=
request
.
get
(
'session_id'
,
None
)
if
session_id
is
None
:
if
session_id
is
None
:
## first call so generate session_id and send back via cookie
## first call so generate session_id and send back via cookie
session_id
=
'erp5runmydocs_'
+
context
.
REQUEST
.
other
[
'AUTHENTICATED_USER'
].
getUserName
()
session_id
=
'erp5runmydocs_'
+
context
.
REQUEST
.
other
[
'AUTHENTICATED_USER'
].
get
IdOr
UserName
()
request
.
RESPONSE
.
setCookie
(
'erp5_session_id'
,
request
.
RESPONSE
.
setCookie
(
'erp5_session_id'
,
session_id
,
session_id
,
expires
=
(
now
+
expire_timeout_days
).
fCommon
(),
path
=
'/'
)
expires
=
(
now
+
expire_timeout_days
).
fCommon
(),
path
=
'/'
)
...
...
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_generateFilename.py
View file @
a20b4e4b
...
@@ -4,7 +4,7 @@ expire_timeout_days = 1
...
@@ -4,7 +4,7 @@ expire_timeout_days = 1
session_id
=
request
.
get
(
'session_id'
,
None
)
session_id
=
request
.
get
(
'session_id'
,
None
)
if
session_id
is
None
or
not
session_id
.
startswith
(
"erp5zuite"
):
if
session_id
is
None
or
not
session_id
.
startswith
(
"erp5zuite"
):
## first call so generate session_id and send back via cookie
## first call so generate session_id and send back via cookie
session_id
=
'erp5zuite_'
+
context
.
REQUEST
.
other
[
'AUTHENTICATED_USER'
].
getUserName
()
session_id
=
'erp5zuite_'
+
context
.
REQUEST
.
other
[
'AUTHENTICATED_USER'
].
get
IdOr
UserName
()
request
.
RESPONSE
.
setCookie
(
'erp5_session_id'
,
session_id
,
expires
=
(
now
+
expire_timeout_days
).
fCommon
(),
path
=
'/'
)
request
.
RESPONSE
.
setCookie
(
'erp5_session_id'
,
session_id
,
expires
=
(
now
+
expire_timeout_days
).
fCommon
(),
path
=
'/'
)
session
=
context
.
portal_sessions
[
session_id
]
session
=
context
.
portal_sessions
[
session_id
]
...
...
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.py
View file @
a20b4e4b
...
@@ -5,7 +5,7 @@ if module_id_list is None:
...
@@ -5,7 +5,7 @@ if module_id_list is None:
module_id_list
=
context
.
WebSection_getDefaultToolbarModuleItemList
()
module_id_list
=
context
.
WebSection_getDefaultToolbarModuleItemList
()
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
user
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user
=
portal
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
web_site_id
=
getattr
(
context
,
'getWebSiteValue'
,
None
)
is
not
None
and
\
web_site_id
=
getattr
(
context
,
'getWebSiteValue'
,
None
)
is
not
None
and
\
context
.
getWebSiteValue
().
getId
()
context
.
getWebSiteValue
().
getId
()
...
...
bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_core/ERP5Site_renderNavigationBox.py
View file @
a20b4e4b
...
@@ -3,7 +3,7 @@ from Products.ERP5Type.Cache import CachingMethod
...
@@ -3,7 +3,7 @@ from Products.ERP5Type.Cache import CachingMethod
navigation_box_render
=
context
.
ERP5Site_navigationBox
navigation_box_render
=
context
.
ERP5Site_navigationBox
navigation_box_render
=
CachingMethod
(
navigation_box_render
,
navigation_box_render
=
CachingMethod
(
navigation_box_render
,
(
"ERP5Site_renderCachedNavigationBox"
,
(
"ERP5Site_renderCachedNavigationBox"
,
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
(),
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
(),
context
.
Localizer
.
get_selected_language
(),
context
.
Localizer
.
get_selected_language
(),
context
.
portal_url
(),
context
.
portal_url
(),
),
cache_factory
=
'erp5_ui_short'
)
),
cache_factory
=
'erp5_ui_short'
)
...
...
product/ERP5/Extensions/CachePageTemplate.py
View file @
a20b4e4b
...
@@ -14,7 +14,7 @@ def getCachedPageTemplate(self, id=None, REQUEST=None):
...
@@ -14,7 +14,7 @@ def getCachedPageTemplate(self, id=None, REQUEST=None):
# Get the user id and request
# Get the user id and request
if
not
REQUEST
:
if
not
REQUEST
:
REQUEST
=
get_request
()
REQUEST
=
get_request
()
user_id
=
self
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user_id
=
self
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
key
=
(
user_id
,
id
)
key
=
(
user_id
,
id
)
# lookup the cache for time
# lookup the cache for time
now
=
time
.
time
()
now
=
time
.
time
()
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.py
View file @
a20b4e4b
from
Products.ERP5Type.Cache
import
CachingMethod
from
Products.ERP5Type.Cache
import
CachingMethod
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
user
=
portal
.
portal_membership
.
getAuthenticatedMember
().
getUserName
()
user
=
portal
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
()
def
getModuleItemList
(
user
=
None
):
def
getModuleItemList
(
user
=
None
):
gettext
=
portal
.
Localizer
.
erp5_ui
.
gettext
gettext
=
portal
.
Localizer
.
erp5_ui
.
gettext
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5Site_renderCachedNavigationBox.py
View file @
a20b4e4b
...
@@ -2,7 +2,7 @@ from Products.ERP5Type.Cache import CachingMethod
...
@@ -2,7 +2,7 @@ from Products.ERP5Type.Cache import CachingMethod
navigation_box_render
=
context
.
navigation_box_render
navigation_box_render
=
context
.
navigation_box_render
navigation_box_render
=
CachingMethod
(
navigation_box_render
,
navigation_box_render
=
CachingMethod
(
navigation_box_render
,
(
"ERP5Site_renderCachedNavigationBox"
,
(
"ERP5Site_renderCachedNavigationBox"
,
context
.
portal_membership
.
getAuthenticatedMember
().
getUserName
(),
context
.
portal_membership
.
getAuthenticatedMember
().
get
IdOr
UserName
(),
context
.
Localizer
.
get_selected_language
(),
context
.
Localizer
.
get_selected_language
(),
context
.
portal_url
(),
context
.
portal_url
(),
),
cache_factory
=
'erp5_ui_short'
)
),
cache_factory
=
'erp5_ui_short'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment