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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
erp5
Commits
26c75d1f
Commit
26c75d1f
authored
Feb 09, 2016
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: form inside form is forbidden
parent
c496ff02
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
43 deletions
+39
-43
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_html.xml
...Item/web_page_module/rjs_gadget_erp5_searchfield_html.xml
+9
-13
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_js.xml
...teItem/web_page_module/rjs_gadget_erp5_searchfield_js.xml
+5
-5
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testComplexFilter.xml
...tal_tests/renderjs_ui_listbox_zuite/testComplexFilter.xml
+4
-4
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilter.xml
...tem/portal_tests/renderjs_ui_listbox_zuite/testFilter.xml
+4
-4
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterItemAutoBuild.xml
...sts/renderjs_ui_listbox_zuite/testFilterItemAutoBuild.xml
+4
-4
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterItemDelete.xml
..._tests/renderjs_ui_listbox_zuite/testFilterItemDelete.xml
+5
-5
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPager.xml
...l_tests/renderjs_ui_listbox_zuite/testFilterWithPager.xml
+4
-4
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPreviousNext.xml
.../renderjs_ui_listbox_zuite/testFilterWithPreviousNext.xml
+4
-4
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_html.xml
View file @
26c75d1f
...
@@ -125,19 +125,15 @@
...
@@ -125,19 +125,15 @@
<div
class=
"ui-field-contain"
>
\n
<div
class=
"ui-field-contain"
>
\n
<div
class=
"bottom"
>
\n
<div
class=
"bottom"
>
\n
<div
class=
"ui-input-text ui-body-{{theme}} ui-input-has-icon ui-corner-all ui-shadow-inset ui-input-has-clear"
>
\n
<div
class=
"ui-input-text ui-body-{{theme}} ui-input-has-icon ui-corner-all ui-shadow-inset ui-input-has-clear"
>
\n
<form
class=
"save_form"
>
\n
<input
type=
"text"
data-enhanced=
"true"
value=
"{{widget_value}}"
name=
"search"
{{widget_status_attribute}}
>
\n
<input
type=
"text"
data-enhanced=
"true"
value=
"{{widget_value}}"
name=
"search"
{{widget_status_attribute}}
>
\n
<div
class=
"ui-btn ui-input-clear ui-input-btn ui-corner-all ui-icon-search ui-btn-icon-notext"
data-i18n=
"[node]header-submit"
>
\n
<div
class=
"ui-btn ui-input-clear ui-input-btn ui-corner-all ui-icon-search ui-btn-icon-notext"
data-i18n=
"[node]header-submit"
>
\n
- Submit
<input
data-enhanced=
"true"
type=
"submit"
data-i18n=
"[value]header-submit"
value=
"Submit"
{{widget_status_attribute}}
/>
\n
- Submit
<input
data-enhanced=
"true"
type=
"submit"
data-i18n=
"[value]header-submit"
value=
"Submit"
{{widget_status_attribute}}
/>
\n
</div>
\n
</div>
\n
</form>
\n
</div>
\n
</div>
\n
<div
class=
"ui-shadow-inset ui-btn ui-btn-inline ui-corner-all ui-btn-{{theme}} ui-btn-icon-notext ui-icon-filter ui-override-theme "
>
\n
<div
class=
"ui-shadow-inset ui-btn ui-btn-inline ui-corner-all ui-btn-{{theme}} ui-btn-icon-notext ui-icon-filter ui-override-theme "
>
\n
<form
class=
"filter_form"
>
\n
<div
class=
"ui-input-btn"
>
\n
<div
class=
"ui-input-btn"
>
\n
<input
class=
"filter_button"
data-role=
"button"
data-enhanced=
"true"
type=
"submit"
data-i18n=
"[value]"
value=
" "
>
\n
<input
data-role=
"button"
data-enhanced=
"true"
type=
"submit"
data-i18n=
"[value]"
value=
" "
>
\n
</div>
\n
</div>
\n
</form>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
...
@@ -285,7 +281,7 @@
...
@@ -285,7 +281,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
94
7.32333.16329.53265
</string>
</value>
<value>
<string>
94
8.36261.46161.37597
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -303,7 +299,7 @@
...
@@ -303,7 +299,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
48969299.26
</float>
<float>
14
53137329.15
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_js.xml
View file @
26c75d1f
...
@@ -185,10 +185,10 @@
...
@@ -185,10 +185,10 @@
var gadget = this,\n
var gadget = this,\n
url,\n
url,\n
options = {},\n
options = {},\n
sort_
form = gadget.props.element.querySelector(".filter_form
");\n
sort_
button = gadget.props.element.querySelector(".filter_button
");\n
return loopEventListener(\n
return loopEventListener(\n
sort_
form
,\n
sort_
button
,\n
"
submit
",\n
"
click
",\n
false,\n
false,\n
function () {\n
function () {\n
return new RSVP.Queue()\n
return new RSVP.Queue()\n
...
@@ -341,7 +341,7 @@
...
@@ -341,7 +341,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
94
7.25574.60857.20718
</string>
</value>
<value>
<string>
94
8.36257.33692.30037
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -359,7 +359,7 @@
...
@@ -359,7 +359,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
48889581.09
</float>
<float>
14
53137078.14
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testComplexFilter.xml
View file @
26c75d1f
...
@@ -91,13 +91,13 @@
...
@@ -91,13 +91,13 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form
\']
</td>
\n
<td>
//
input[@class=\'filter_button
\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -220,7 +220,7 @@
...
@@ -220,7 +220,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilter.xml
View file @
26c75d1f
...
@@ -91,13 +91,13 @@
...
@@ -91,13 +91,13 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form
\']
</td>
\n
<td>
//
input[@class=\'filter_button
\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -180,7 +180,7 @@
...
@@ -180,7 +180,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -276,7 +276,7 @@
...
@@ -276,7 +276,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterItemAutoBuild.xml
View file @
26c75d1f
...
@@ -92,13 +92,13 @@
...
@@ -92,13 +92,13 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form
\']
</td>
\n
<td>
//
input[@class=\'filter_button
\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -195,7 +195,7 @@
...
@@ -195,7 +195,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -274,7 +274,7 @@
...
@@ -274,7 +274,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterItemDelete.xml
View file @
26c75d1f
...
@@ -91,13 +91,13 @@
...
@@ -91,13 +91,13 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form
\']
</td>
\n
<td>
//
input[@class=\'filter_button
\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -239,14 +239,14 @@
...
@@ -239,14 +239,14 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPager.xml
View file @
26c75d1f
...
@@ -91,13 +91,13 @@
...
@@ -91,13 +91,13 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form
\']
</td>
\n
<td>
//
input[@class=\'filter_button
\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -319,14 +319,14 @@
...
@@ -319,14 +319,14 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterWithPreviousNext.xml
View file @
26c75d1f
...
@@ -91,13 +91,13 @@
...
@@ -91,13 +91,13 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form
\']
</td>
\n
<td>
//
input[@class=\'filter_button
\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
@@ -220,14 +220,14 @@
...
@@ -220,14 +220,14 @@
\n
\n
<tr>
\n
<tr>
\n
<td>
waitForElementPresent
</td>
\n
<td>
waitForElementPresent
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
\n
\n
<tr>
\n
<tr>
\n
<td>
click
</td>
\n
<td>
click
</td>
\n
<td>
//
form[@class=\'filter_form\']//input
</td>
\n
<td>
//
input[@class=\'filter_button\']
</td>
\n
<td></td>
\n
<td></td>
\n
</tr>
\n
</tr>
\n
\n
\n
...
...
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