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
137
Merge Requests
137
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
4f1765c1
Commit
4f1765c1
authored
Apr 19, 2018
by
Tomáš Peterka
Committed by
Tomáš Peterka
Apr 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[tests] Update tests and fix one bug so everything passes again
parent
275758e6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
bt5/erp5_crm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_crm_action_zuite/testCRMUpdateCreateResponseDialog.zpt
...ui_crm_action_zuite/testCRMUpdateCreateResponseDialog.zpt
+1
-1
bt5/erp5_crm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_crm_action_zuite/testCRMUpdateCreateResponseDialogFromNotificationMessage.zpt
...tCRMUpdateCreateResponseDialogFromNotificationMessage.zpt
+1
-1
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
...tem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
+1
-1
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_notification_zuite/testWorkflowTransitionFail.zpt
...erjs_ui_notification_zuite/testWorkflowTransitionFail.zpt
+1
-1
No files found.
bt5/erp5_crm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_crm_action_zuite/testCRMUpdateCreateResponseDialog.zpt
View file @
4f1765c1
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/update_dialog"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/update_dialog"
/>
<tal:block
tal:define=
"notification_configuration python: {'class': 'success',
<tal:block
tal:define=
"notification_configuration python: {'class': 'success',
'text': 'Data received'}"
>
'text': 'Data received
.
'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
</tal:block>
</tal:block>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
...
...
bt5/erp5_crm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_crm_action_zuite/testCRMUpdateCreateResponseDialogFromNotificationMessage.zpt
View file @
4f1765c1
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/update_dialog"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/update_dialog"
/>
<tal:block
tal:define=
"notification_configuration python: {'class': 'success',
<tal:block
tal:define=
"notification_configuration python: {'class': 'success',
'text': 'Data received'}"
>
'text': 'Data received
.
'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
</tal:block>
</tal:block>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
...
...
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
View file @
4f1765c1
...
@@ -19,7 +19,7 @@ if context.isDeletable(check_relation=True):
...
@@ -19,7 +19,7 @@ if context.isDeletable(check_relation=True):
else
:
else
:
parent
.
manage_delObjects
(
ids
=
[
context
.
getId
()])
parent
.
manage_delObjects
(
ids
=
[
context
.
getId
()])
# redirect back to the container since the context was deleted
# redirect back to the container since the context was deleted
return
container
.
Base_redirect
(
return
parent
.
Base_redirect
(
keep_items
=
{
keep_items
=
{
"portal_status_message"
:
translate
(
"Document deleted"
)
"portal_status_message"
:
translate
(
"Document deleted"
)
})
})
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_notification_zuite/testWorkflowTransitionFail.zpt
View file @
4f1765c1
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
<tal:block
tal:define=
"notification_configuration python: {'class': 'error',
<tal:block
tal:define=
"notification_configuration python: {'class': 'error',
'text': 'Workflow script raised
.
'}"
>
'text': 'Workflow script raised'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
</tal:block>
</tal:block>
...
...
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