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
Labels
Merge Requests
141
Merge Requests
141
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
9d3d0e36
Commit
9d3d0e36
authored
Oct 27, 2016
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use getId() instead of __str__.
parent
a1dbe3d6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.py
...al_skins/erp5_accounting_ui_test/AccountingZuite_reset.py
+1
-1
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.zpt
...rtal_skins/erp5_xhtml_style/template_erp5_xhtml_style.zpt
+1
-1
product/ERP5Form/Tool/SelectionTool.py
product/ERP5Form/Tool/SelectionTool.py
+1
-1
product/ERP5Type/tests/testCookieCrumbler.py
product/ERP5Type/tests/testCookieCrumbler.py
+1
-1
product/ERP5VCS/Subversion.py
product/ERP5VCS/Subversion.py
+2
-2
No files found.
bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.py
View file @
9d3d0e36
...
@@ -30,7 +30,7 @@ for entity in ( portal.organisation_module.objectValues() +
...
@@ -30,7 +30,7 @@ for entity in ( portal.organisation_module.objectValues() +
# enable preference
# enable preference
ptool
=
portal
.
portal_preferences
ptool
=
portal
.
portal_preferences
pref
=
ptool
.
accounting_zuite_preference
pref
=
ptool
.
accounting_zuite_preference
if
pref
.
owner_info
()[
'id'
]
!=
str
(
context
.
REQUEST
.
AUTHENTICATED_USER
):
if
pref
.
owner_info
()[
'id'
]
!=
context
.
REQUEST
.
AUTHENTICATED_USER
.
getId
(
):
# we have to 'own' the preference for the test
# we have to 'own' the preference for the test
ptool
=
portal
.
portal_preferences
ptool
=
portal
.
portal_preferences
# pref.setId('old_accounting_zuite_preference')
# pref.setId('old_accounting_zuite_preference')
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.zpt
View file @
9d3d0e36
...
@@ -56,7 +56,7 @@ DEPRECATION:
...
@@ -56,7 +56,7 @@ DEPRECATION:
<div
id=
"logged_in_as"
class=
"logged_in_as"
>
<div
id=
"logged_in_as"
class=
"logged_in_as"
>
<tal:block
tal:condition=
"not: portal/portal_membership/isAnonymousUser"
>
<tal:block
tal:condition=
"not: portal/portal_membership/isAnonymousUser"
>
<span
class=
"logged_txt"
i18n:translate=
""
i18n:domain=
"ui"
>
Logged In as :
</span>
<span
class=
"logged_txt"
i18n:translate=
""
i18n:domain=
"ui"
>
Logged In as :
</span>
<tal:block
tal:replace=
"python:portal.portal_membership.getAuthenticatedMember().get
UserName
()"
/>
<tal:block
tal:replace=
"python:portal.portal_membership.getAuthenticatedMember().get
Id
()"
/>
</tal:block>
</tal:block>
</div>
</div>
<p
class=
"clear"
></p>
<p
class=
"clear"
></p>
...
...
product/ERP5Form/Tool/SelectionTool.py
View file @
9d3d0e36
...
@@ -1430,7 +1430,7 @@ class SelectionTool( BaseTool, SimpleItem ):
...
@@ -1430,7 +1430,7 @@ class SelectionTool( BaseTool, SimpleItem ):
user_id
=
tv
.
get
(
'_user_id'
,
None
)
user_id
=
tv
.
get
(
'_user_id'
,
None
)
if
user_id
is
not
None
:
if
user_id
is
not
None
:
return
user_id
return
user_id
user_id
=
self
.
portal_membership
.
getAuthenticatedMember
().
get
UserName
()
user_id
=
self
.
portal_membership
.
getAuthenticatedMember
().
get
Id
()
tv
[
'_user_id'
]
=
user_id
tv
[
'_user_id'
]
=
user_id
return
user_id
return
user_id
...
...
product/ERP5Type/tests/testCookieCrumbler.py
View file @
9d3d0e36
...
@@ -81,7 +81,7 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
...
@@ -81,7 +81,7 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
self
.
req
.
traverse
(
'/'
)
self
.
req
.
traverse
(
'/'
)
self
.
assert_
(
self
.
req
.
has_key
(
'AUTHENTICATED_USER'
))
self
.
assert_
(
self
.
req
.
has_key
(
'AUTHENTICATED_USER'
))
self
.
assertEqual
(
self
.
req
[
'AUTHENTICATED_USER'
].
get
UserName
(),
self
.
assertEqual
(
self
.
req
[
'AUTHENTICATED_USER'
].
get
Id
(),
'abrahammmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm'
)
'abrahammmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm'
)
resp
=
self
.
req
.
response
resp
=
self
.
req
.
response
self
.
assert_
(
resp
.
cookies
.
has_key
(
'__ac'
))
self
.
assert_
(
resp
.
cookies
.
has_key
(
'__ac'
))
...
...
product/ERP5VCS/Subversion.py
View file @
9d3d0e36
...
@@ -112,8 +112,8 @@ class Subversion(WorkingCopy):
...
@@ -112,8 +112,8 @@ class Subversion(WorkingCopy):
if
username
:
if
username
:
username
=
username
.
strip
()
username
=
username
.
strip
()
return
(
username
or
return
(
username
or
# not set in preferences, then we get the current user
name
in zope
# not set in preferences, then we get the current user
id
in zope
portal
.
portal_membership
.
getAuthenticatedMember
().
get
UserName
())
portal
.
portal_membership
.
getAuthenticatedMember
().
get
Id
())
def
_getClient
(
self
,
**
kw
):
def
_getClient
(
self
,
**
kw
):
return
newSubversionClient
(
self
,
**
kw
)
return
newSubversionClient
(
self
,
**
kw
)
...
...
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