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
138
Merge Requests
138
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
d38a44ef
Commit
d38a44ef
authored
Feb 08, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
web_renderjs_ui: py3
parent
c691bef8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_extractReferredObjectDictFromHtml.py
..._skins/erp5_web/Base_extractReferredObjectDictFromHtml.py
+1
-1
bt5/erp5_web_renderjs_ui/ExtensionTemplateItem/portal_components/extension.erp5.WebRenderJSUI.py
...ateItem/portal_components/extension.erp5.WebRenderJSUI.py
+1
-1
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_once_form.zpt
...tem/portal_skins/erp5_web_renderjs_ui/login_once_form.zpt
+1
-1
bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py
...mplateItem/portal_components/test.erp5.testRJSUpgrader.py
+3
-3
No files found.
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_extractReferredObjectDictFromHtml.py
View file @
d38a44ef
...
@@ -24,7 +24,7 @@ if not isinstance(deny_tag_list, (list, tuple)):
...
@@ -24,7 +24,7 @@ if not isinstance(deny_tag_list, (list, tuple)):
deny_tag_list
=
[]
deny_tag_list
=
[]
def
main
(
data
):
def
main
(
data
):
if
isinstance
(
data
,
str
):
if
isinstance
(
data
,
bytes
):
data
=
data
.
decode
(
"utf-8"
)
data
=
data
.
decode
(
"utf-8"
)
for
part
in
context
.
Base_parseHtml
(
data
):
for
part
in
context
.
Base_parseHtml
(
data
):
handleHtmlPart
(
part
)
handleHtmlPart
(
part
)
...
...
bt5/erp5_web_renderjs_ui/ExtensionTemplateItem/portal_components/extension.erp5.WebRenderJSUI.py
View file @
d38a44ef
...
@@ -12,7 +12,7 @@ def ERP5Site_extractTranslationMessageListFromHTML(self, text_content):
...
@@ -12,7 +12,7 @@ def ERP5Site_extractTranslationMessageListFromHTML(self, text_content):
"""
"""
if
not
text_content
:
if
not
text_content
:
return
return
if
isinstance
(
text_content
,
str
):
if
isinstance
(
text_content
,
bytes
):
text_content
=
text_content
.
decode
(
'utf-8'
)
text_content
=
text_content
.
decode
(
'utf-8'
)
parser
=
lxml
.
etree
.
HTMLParser
()
parser
=
lxml
.
etree
.
HTMLParser
()
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_once_form.zpt
View file @
d38a44ef
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
</div>
</div>
<div
class=
"dialog_button_container"
>
<div
class=
"dialog_button_container"
>
<input
type=
"submit"
value=
"Login"
i18n:attributes=
"value"
i18n:domain=
"ui"
tal:attributes=
"name python: '%s:method' % (form_action, )"
/>
<input
type=
"submit"
value=
"Login"
i18n:attributes=
"value"
i18n:domain=
"ui"
tal:attributes=
"name python: '%s:method' % (form_action, )"
/>
<a
i18n:domain=
"ui"
i18n:translate=
""
tal:attributes=
"href python: '%sWebSite_viewRecoverAccount?%s' % (absolute_url, modules['
urllib
'].urlencode([('came_from', absolute_url)]))"
>
I forgot my password!
</a>
<a
i18n:domain=
"ui"
i18n:translate=
""
tal:attributes=
"href python: '%sWebSite_viewRecoverAccount?%s' % (absolute_url, modules['
six.moves.urllib.parse
'].urlencode([('came_from', absolute_url)]))"
>
I forgot my password!
</a>
</div>
</div>
<div
class=
"dialog_button_container"
tal:condition=
"enable_google_login"
>
<div
class=
"dialog_button_container"
tal:condition=
"enable_google_login"
>
<a
tal:attributes=
"href python: root_absolute_url + 'ERP5Site_redirectToGoogleLoginPage'"
<a
tal:attributes=
"href python: root_absolute_url + 'ERP5Site_redirectToGoogleLoginPage'"
...
...
bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py
View file @
d38a44ef
...
@@ -25,9 +25,9 @@
...
@@ -25,9 +25,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
##############################################################################
##############################################################################
from
six.moves
import
cStringIO
as
StringIO
import
textwrap
import
textwrap
import
time
import
time
import
io
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
...
@@ -332,12 +332,12 @@ class TestRenderUpdateTranslationData(RenderJSUpgradeTestCase):
...
@@ -332,12 +332,12 @@ class TestRenderUpdateTranslationData(RenderJSUpgradeTestCase):
def
test_WebSite_getTranslationDataTextContent_extract_from_file
(
self
):
def
test_WebSite_getTranslationDataTextContent_extract_from_file
(
self
):
self
.
portal
.
portal_skins
.
custom
.
manage_addProduct
[
'OFS'
].
manage_addFile
(
self
.
portal
.
portal_skins
.
custom
.
manage_addProduct
[
'OFS'
].
manage_addFile
(
'test_portal_skins_gadget.html'
,
'test_portal_skins_gadget.html'
,
file
=
String
IO
(
textwrap
.
dedent
(
'''
file
=
io
.
Bytes
IO
(
textwrap
.
dedent
(
'''
<html>
<html>
<!--
<!--
data-i18n=Message from file
data-i18n=Message from file
-->
-->
</html>'''
)))
</html>'''
)
.
encode
()
))
self
.
portal
.
changeSkin
(
None
)
# refresh skin cache
self
.
portal
.
changeSkin
(
None
)
# refresh skin cache
translation_data_text_content
=
self
.
web_site
.
WebSite_getTranslationDataTextContent
()
translation_data_text_content
=
self
.
web_site
.
WebSite_getTranslationDataTextContent
()
self
.
assertIn
(
'"Message from file":'
,
translation_data_text_content
)
self
.
assertIn
(
'"Message from file":'
,
translation_data_text_content
)
...
...
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