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
140
Merge Requests
140
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
d9c6a501
Commit
d9c6a501
authored
Oct 28, 2015
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: don't loss form element
parent
03626609
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
27 deletions
+33
-27
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
+4
-6
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
+29
-21
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_searchfield_html.xml
View file @
d9c6a501
...
@@ -124,9 +124,9 @@
...
@@ -124,9 +124,9 @@
<div
class=
"field_container"
>
\n
<div
class=
"field_container"
>
\n
<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
{{status_class}} {{css_class}}
"
>
\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
<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]{{search_i18n}}"
>
\n
<div
class=
"ui-btn ui-input-clear ui-input-btn ui-corner-all ui-icon-search ui-btn-icon-notext"
data-i18n=
"[node]{{search_i18n}}"
>
\n
{{search_i18n}}
<input
tabindex=
"-1"
data-role=
"button"
data-enhanced=
"true"
type=
"submit"
data-i18n=
"[value]{{search_i18n}}"
value=
" "
/>
\n
{{search_i18n}}
<input
tabindex=
"-1"
data-role=
"button"
data-enhanced=
"true"
type=
"submit"
data-i18n=
"[value]{{search_i18n}}"
value=
" "
/>
\n
</div>
\n
</div>
\n
...
@@ -137,7 +137,6 @@
...
@@ -137,7 +137,6 @@
<div
class=
"ui-input-btn"
>
\n
<div
class=
"ui-input-btn"
>
\n
<input
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
\n
</form>
\n
</form>
\n
</div>
\n
</div>
\n
</div>
\n
</div>
\n
...
@@ -151,7 +150,6 @@
...
@@ -151,7 +150,6 @@
\n
\n
</head>
\n
</head>
\n
<body>
\n
<body>
\n
<div
class=
"container"
></div>
\n
</body>
\n
</body>
\n
</html>
</html>
...
@@ -290,7 +288,7 @@
...
@@ -290,7 +288,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.4
6365.63113.6638
</string>
</value>
<value>
<string>
946.4
7294.45750.61781
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -308,7 +306,7 @@
...
@@ -308,7 +306,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
144
5965410.12
</float>
<float>
144
6021106.86
</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 @
d9c6a501
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
<key>
<string>
text_content
</string>
</key>
<key>
<string>
text_content
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
/*global window, rJS, RSVP, loopEventListener, Handlebars, QueryFactory, SimpleQuery, ComplexQuery, Query */\n
/*global window, rJS, RSVP, loopEventListener, Handlebars, QueryFactory, SimpleQuery, ComplexQuery, Query
, document
*/\n
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
/*jslint nomen: true, indent: 2, maxerr: 3 */\n
(function (window, rJS, RSVP, loopEventListener, Handlebars) {\n
(function (window, rJS, RSVP, loopEventListener, Handlebars) {\n
"use strict";\n
"use strict";\n
...
@@ -143,15 +143,13 @@
...
@@ -143,15 +143,13 @@
// declared methods\n
// declared methods\n
/////////////////////////////////////////////////////////////////\n
/////////////////////////////////////////////////////////////////\n
.declareMethod(\'render\', function (option_dict) {\n
.declareMethod(\'render\', function (option_dict) {\n
var append_class,\n
var append_attribute,\n
append_attribute,\n
placeholder = "",\n
placeholder = "",\n
value,\n
value,\n
is_disabled = option_dict.disabled,\n
is_disabled = option_dict.disabled,\n
search_gadget = this;\n
search_gadget = this;\n
search_gadget.props.jio_key = option_dict.jio_key;\n
search_gadget.props.jio_key = option_dict.jio_key;\n
if (is_disabled) {\n
if (is_disabled) {\n
append_class = " ui-disabled";\n
append_attribute = \' disabled="disabled\';\n
append_attribute = \' disabled="disabled\';\n
}\n
}\n
value = option_dict.extended_search || "";\n
value = option_dict.extended_search || "";\n
...
@@ -167,13 +165,14 @@
...
@@ -167,13 +165,14 @@
return search_gadget.translateHtml(panel_template({\n
return search_gadget.translateHtml(panel_template({\n
widget_value: value,\n
widget_value: value,\n
widget_theme: option_dict.theme || "c",\n
widget_theme: option_dict.theme || "c",\n
widget_status_attribute: append_attribute || placeholder,\n
widget_status_attribute: append_attribute || placeholder\n
widget_status_class: append_class || placeholder\n
}));\n
}));\n
})\n
})\n
.push(function (my_translated_html) {\n
.push(function (my_translated_html) {\n
search_gadget.props.element.querySelector(".container").innerHTML =\n
var container = document.createElement("div");\n
my_translated_html;\n
container.setAttribute("class", "container");\n
container.innerHTML = my_translated_html;\n
search_gadget.props.element.appendChild(container);\n
});\n
});\n
})\n
})\n
.declareMethod("showQueryError", function (param) {\n
.declareMethod("showQueryError", function (param) {\n
...
@@ -243,7 +242,9 @@
...
@@ -243,7 +242,9 @@
type: "complex"\n
type: "complex"\n
});\n
});\n
}\n
}\n
return gadget.redirect({command: \'change\', options: {\n
return gadget.redirect({\n
command: \'change\',\n
options: {\n
"extended_search": Query.objectToSearchText(new ComplexQuery({\n
"extended_search": Query.objectToSearchText(new ComplexQuery({\n
operator: search_query.operator || "AND",\n
operator: search_query.operator || "AND",\n
query_list: query_list,\n
query_list: query_list,\n
...
@@ -251,10 +252,17 @@
...
@@ -251,10 +252,17 @@
})),\n
})),\n
"domain_tree": domain_tree_query ? Query.objectToSearchText(domain_tree_query) : "",\n
"domain_tree": domain_tree_query ? Query.objectToSearchText(domain_tree_query) : "",\n
"hide_item": hide_query ? Query.objectToSearchText(hide_query) : ""\n
"hide_item": hide_query ? Query.objectToSearchText(hide_query) : ""\n
}});\n
}\n
}\n
return gadget.redirect({command: \'change\', options:{\n
});\n
"extended_search": "", "domain_tree": "", "hide_item": ""}});\n
}\n
return gadget.redirect({\n
command: \'change\',\n
options: {\n
"extended_search": "",\n
"domain_tree": "",\n
"hide_item": ""\n
}\n
});\n
});\n
});\n
}\n
}\n
// Listen to form submit\n
// Listen to form submit\n
...
@@ -410,7 +418,7 @@
...
@@ -410,7 +418,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.4
6366.4373.50670
</string>
</value>
<value>
<string>
946.4
7311.65417.26606
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -428,7 +436,7 @@
...
@@ -428,7 +436,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
144
5965368.84
</float>
<float>
144
6022123.95
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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