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
Frederic Thoma
erp5
Commits
70b2ab02
Commit
70b2ab02
authored
Feb 05, 2020
by
Roque
Committed by
Roque
Feb 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[officejs] Fix linshare storage bug
/reviewed-on
!1017
parent
f1f415a3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
445 additions
and
3 deletions
+445
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.js
...dule/gadget_officejs_page_ojs_linshare_configurator_js.js
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.xml
...ule/gadget_officejs_page_ojs_linshare_configurator_js.xml
+2
-2
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorLinshareStorage.xml
...exteditor_zuite/testOfficeJSTextEditorLinshareStorage.xml
+58
-0
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorLinshareStorage.zpt
...exteditor_zuite/testOfficeJSTextEditorLinshareStorage.zpt
+384
-0
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.js
View file @
70b2ab02
...
...
@@ -86,7 +86,7 @@
return
gadget
.
setSetting
(
'
jio_storage_description
'
,
configuration
);
})
.
push
(
function
()
{
return
gadget
.
setSetting
(
'
jio_storage_name
'
,
options
.
name
);
return
gadget
.
setSetting
(
'
jio_storage_name
'
,
options
.
name
||
"
LINSHARE
"
);
})
.
push
(
function
()
{
return
gadget
.
setSetting
(
'
sync_reload
'
,
true
);
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.xml
View file @
70b2ab02
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
73.43371.54750.44595
</string>
</value>
<value>
<string>
9
81.42114.58215.33843
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
15
50139619.39
</float>
<float>
15
80919827.44
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorLinshareStorage.xml
0 → 100644
View file @
70b2ab02
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ZopePageTemplate"
module=
"Products.PageTemplates.ZopePageTemplate"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
content_type
</string>
</key>
<value>
<string>
text/html
</string>
</value>
</item>
<item>
<key>
<string>
expand
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
testOfficeJSTextEditorLinshareStorage
</string>
</value>
</item>
<item>
<key>
<string>
output_encoding
</string>
</key>
<value>
<string>
utf-8
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<unicode></unicode>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_texteditor_zuite/testOfficeJSTextEditorLinshareStorage.zpt
0 → 100644
View file @
70b2ab02
<html
xmlns:tal=
"http://xml.zope.org/namespaces/tal"
xmlns:metal=
"http://xml.zope.org/namespaces/metal"
>
<head>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
>
<title>
Test OfficeJS UI
</title>
</head>
<body>
<table
cellpadding=
"1"
cellspacing=
"1"
border=
"1"
>
<thead>
<tr><td
rowspan=
"1"
colspan=
"3"
>
Test OfficeJS UI
</td></tr>
</thead><tbody>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplate/macros/init"
/>
<!-- Clean Up -->
<tr>
<td>
open
</td>
<td>
${base_url}/bar_module/ListBoxZuite_reset
</td>
<td></td>
</tr>
<tr>
<td>
assertTextPresent
</td>
<td>
Reset Successfully.
</td>
<td></td>
</tr>
<tr>
<td>
store
</td>
<td>
https://demo.linshare.org/
</td>
<td>
linshare_url
</td>
</tr>
<tr>
<td>
store
</td>
<td>
user1@linshare.org
</td>
<td>
linshare_user
</td>
</tr>
<tr>
<td>
store
</td>
<td>
password1
</td>
<td>
linshare_pass
</td>
</tr>
<!-- Initialize -->
<tr>
<td>
open
</td>
<td>
${base_url}/web_site_module/officejs_text_editor/
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
link=Storages
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
link=Storages
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
link=Linshare
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
link=Linshare
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
name=url
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
name=url
</td>
<td>
${linshare_url}
</td>
</tr>
<tr>
<td>
type
</td>
<td>
name=username
</td>
<td>
${linshare_user}
</td>
</tr>
<tr>
<td>
type
</td>
<td>
name=password
</td>
<td>
${linshare_pass}
</td>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Proceed']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//a[@data-i18n="Add"]
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//a[@data-i18n="Add"]
</td>
<td></td>
</tr>
<!-- As all resources are now in indexedDB, is faster than before and sometimes the header spinner icon doesn't apprear
Wait for spinner was removed, but a minimum pause is needed before continue -->
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
identifier=title
</td>
<td></td>
</tr>
<tr>
<td>
store
</td>
<td>
Titre
</td>
<td>
title
</td>
</tr>
<tr>
<td>
store
</td>
<td
tal:content=
"python: ('Test Reference %s' % DateTime()).replace(' ','.').replace(':', '.').replace('/', '.')"
>
Reference
</td>
<td>
reference
</td>
</tr>
<tr>
<td>
store
</td>
<td
tal:content=
"python: 'Test Description %s' % DateTime()"
>
Today
</td>
<td>
description
</td>
</tr>
<tr>
<td>
type
</td>
<td>
name=reference
</td>
<td>
${reference}
</td>
</tr>
<tr>
<td>
type
</td>
<td>
name=title
</td>
<td>
${title}
</td>
</tr>
<tr>
<td>
type
</td>
<td>
identifier=description
</td>
<td>
${description}
</td>
</tr>
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Save']
</td>
<td></td>
</tr>
<!-- As all resources are now in indexedDB, is faster than before and sometimes the header spinner icon doesn't apprear
Wait for spinner was removed, but a minimum pause is needed before continue -->
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tal:block
tal:define=
"notification_configuration python: {'class': 'success',
'text': 'Data Updated'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
</tal:block>
<tr>
<td>
click
</td>
<td>
//a[@data-i18n='Document']
</td>
<td></td>
</tr>
<!-- As all resources are now in indexedDB, is faster than before and sometimes the header spinner icon doesn't apprear
Wait for spinner was removed, but a minimum pause is needed before continue -->
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<!-- Verify Search, add another document -->
<tr>
<td>
waitForElementPresent
</td>
<td>
//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//a[@data-i18n="Add"]
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//a[@data-i18n="Add"]
</td>
<td></td>
</tr>
<!-- As all resources are now in indexedDB, is faster than before and sometimes the header spinner icon doesn't apprear
Wait for spinner was removed, but a minimum pause is needed before continue -->
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tr>
<td>
store
</td>
<td>
search
</td>
<td>
search
</td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
identifier=title
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
name=reference
</td>
<td>
${search}
</td>
</tr>
<tr>
<td>
type
</td>
<td>
name=title
</td>
<td>
${search}
</td>
</tr>
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Save']
</td>
<td></td>
</tr>
<!-- As all resources are now in indexedDB, is faster than before and sometimes the header spinner icon doesn't apprear
Wait for spinner was removed, but a minimum pause is needed before continue -->
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tal:block
tal:define=
"notification_configuration python: {'class': 'success',
'text': 'Data Updated'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
</tal:block>
<tr>
<td>
click
</td>
<td>
//a[@data-i18n='Document']
</td>
<td></td>
</tr>
<!-- As all resources are now in indexedDB, is faster than before and sometimes the header spinner icon doesn't apprear
Wait for spinner was removed, but a minimum pause is needed before continue -->
<tr>
<td>
pause
</td>
<td>
100
</td>
<td></td>
</tr>
<tal:block
tal:define=
"search_query python: 'Titre'"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/search_in_form_list_without_header_url"
/>
</tal:block>
<tr>
<td>
waitForElementPresent
</td>
<td>
link=${title}
</td>
<td></td>
</tr>
<tr>
<td>
assertTextPresent
</td>
<td>
${title}
</td>
<td></td>
</tr>
<tr>
<td>
assertFailureOnNext
</td>
<td>
false
</td>
<td></td>
</tr>
<tr>
<td>
verifyElementPresent
</td>
<td>
link=${search}
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
link=${title}
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
identifier=title
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name='title']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@value='${title}']
</td>
<td></td>
</tr>
<tr>
<td>
verifyValue
</td>
<td>
title
</td>
<td>
${title}
</td>
</tr>
<tr>
<td>
verifyValue
</td>
<td>
reference
</td>
<td>
${reference}
</td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
identifier=description
</td>
<td></td>
</tr>
<tr>
<td>
verifyValue
</td>
<td>
description
</td>
<td>
${description}
</td>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Menu']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//a[@data-i18n='Synchronize']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
name=search
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
name=search
</td>
<td>
${title}
</td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//button[@data-i18n='Filter']
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//button[@data-i18n='Filter']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//button[@data-i18n='Filter']
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
link=${title}
</td>
<td></td>
</tr>
<tr>
<td>
assertTextPresent
</td>
<td>
${title}
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
link=${title}
</td>
<td></td>
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
identifier=title
</td>
<td></td>
</tr>
<tr>
<td>
verifyValue
</td>
<td>
title
</td>
<td>
${title}
</td>
</tr>
<tr>
<td>
verifyValue
</td>
<td>
reference
</td>
<td>
${reference}
</td>
</tr>
<tr>
<td>
verifyValue
</td>
<td>
description
</td>
<td>
${description}
</td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
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