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
Léo-Paul Géneau
erp5
Commits
6949fb89
Commit
6949fb89
authored
Jun 13, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Submit dialog when pressing enter key
Stop using the update action as the default action.
parent
e391ae7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html
.../web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml
...m/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml
+2
-2
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt
...eb_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt
+4
-4
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html
View file @
6949fb89
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<script
id=
"dialog-button-template"
type=
"text/x-handlebars-template"
>
<script
id=
"dialog-button-template"
type=
"text/x-handlebars-template"
>
{{
#
if
show_update_button
}}
{{
#
if
show_update_button
}}
<
button
disabled
name
=
"
action_update
"
type
=
"
submit
"
data
-
i18n
=
"
Update
"
>
Update
<
/button
>
<
button
disabled
name
=
"
action_update
"
type
=
"
button
"
data
-
i18n
=
"
Update
"
>
Update
<
/button
>
{{
/if}
}
{{
/if}
}
<
input
disabled
name
=
"
action_confirm
"
class
=
"
dialogconfirm
"
type
=
"
submit
"
data
-
i18n
=
"
[value]Proceed
"
value
=
"
Proceed
"
/>
<
input
disabled
name
=
"
action_confirm
"
class
=
"
dialogconfirm
"
type
=
"
submit
"
data
-
i18n
=
"
[value]Proceed
"
value
=
"
Proceed
"
/>
<
a
class
=
"
dialogcancel
"
data
-
i18n
=
"
Cancel
"
>
Cancel
<
/a
>
<
a
class
=
"
dialogcancel
"
data
-
i18n
=
"
Cancel
"
>
Cancel
<
/a
>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml
View file @
6949fb89
...
@@ -232,7 +232,7 @@
...
@@ -232,7 +232,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
3.40657.63647.56780
</string>
</value>
<value>
<string>
97
6.23831.58029.7424
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
54191174.22
</float>
<float>
15
60418147.64
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt
View file @
6949fb89
...
@@ -172,22 +172,22 @@
...
@@ -172,22 +172,22 @@
</tr>
</tr>
<tr>
<tr>
<td>waitForElementNotPresent</td>
<td>waitForElementNotPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
submit
' and @disabled]</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
button
' and @disabled]</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>assertElementNotPresent</td>
<td>assertElementNotPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
submit
' and @disabled]</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
button
' and @disabled]</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>waitForElementPresent</td>
<td>waitForElementPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
submit
']</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
button
']</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>click</td>
<td>click</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
submit
']</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]//button[@name='action_update' and @type='
button
']</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
...
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