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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
0a84f9c5
Commit
0a84f9c5
authored
Sep 28, 2015
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: add missing value for date option
parent
d0907084
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
...eItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
+8
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
View file @
0a84f9c5
...
...
@@ -132,6 +132,7 @@
var i,\n
query = "",\n
value,\n
simple_operator = "",\n
key,\n
simple_query_list = [],\n
complex_query,\n
...
...
@@ -139,6 +140,7 @@
domain_tree_query = "",\n
domain_tree_query_list = [],\n
options = gadget.props.options,\n
date_float_value = ["", ">
", "
<
", "
<
=", ">="],\n
filterforms = gadget.props.element.querySelectorAll(".filterForm"),\n
and = gadget.props.element.querySelector(".and");\n
//when OR is selected, since OR with Related Query is not supported,\n
...
...
@@ -152,6 +154,8 @@
select =
filterforms[i][1][filterforms[i][1].selectedIndex].value;\n
if
(
select =
==
"keyword")
{\n
value =
"%"
+
value
+
"%";\n
}
else
if
(date_float_value.indexOf(select)
!==
-1)
{\n
simple_operator =
select;\n
}\n
if
(filterforms[i][0][filterforms[i][0].selectedIndex]
.value =
==
"Searchable
Text")
{\n
key =
""
;\n
...
...
@@ -162,6 +166,7 @@
simple_query_list.push(new
SimpleQuery(\n
{\n
key:
key,\n
operator:
simple_operator,\n
type:
"simple",\n
value:
value\n
}\n
...
...
@@ -173,6 +178,7 @@
query_list:
[new
SimpleQuery(\n
{\n
key:
key,\n
operator:
simple_operator,\n
type:
"simple",\n
value:
value\n
}\n
...
...
@@ -745,7 +751,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.30
40.41776.59886
</string>
</value>
<value>
<string>
946.30
61.5336.46745
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -763,7 +769,7 @@
</tuple>
<state>
<tuple>
<float>
144345
2242.14
</float>
<float>
144345
3599.6
</float>
<string>
UTC
</string>
</tuple>
</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