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
preetwinder
erp5
Commits
1aa180e3
Commit
1aa180e3
authored
Nov 03, 2015
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Do not generate query string starting with 'AND'
parent
35ea9341
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
...mplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
+9
-5
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
1aa180e3
...
@@ -197,7 +197,7 @@
...
@@ -197,7 +197,7 @@
original_tfoot = props.element.querySelector(\'tfoot\'),\n
original_tfoot = props.element.querySelector(\'tfoot\'),\n
tbody = document.createElement("tbody"),\n
tbody = document.createElement("tbody"),\n
url_query = props.extended_search,\n
url_query = props.extended_search,\n
query_string =
""
,\n
query_string =
new URI(field_json.query).query(true).query
,\n
lines = field_json.lines,\n
lines = field_json.lines,\n
select_list = [],\n
select_list = [],\n
dataset,\n
dataset,\n
...
@@ -214,7 +214,11 @@
...
@@ -214,7 +214,11 @@
\n
\n
if (url_query) {\n
if (url_query) {\n
//query_string = field_json.column_list.reduce(buildQueryString, \' AND (\').replace(new RegExp("OR " + \'$\'), \')\');\n
//query_string = field_json.column_list.reduce(buildQueryString, \' AND (\').replace(new RegExp("OR " + \'$\'), \')\');\n
query_string = \' AND \' + url_query;\n
if (query_string) {\n
query_string = \' AND \' + url_query;\n
} else {\n
query_string = url_query;\n
}\n
}\n
}\n
\n
\n
for (i = 0; i < field_json.column_list.length; i += 1) {\n
for (i = 0; i < field_json.column_list.length; i += 1) {\n
...
@@ -224,7 +228,7 @@
...
@@ -224,7 +228,7 @@
return gadget.jio_allDocs({\n
return gadget.jio_allDocs({\n
// XXX Not jIO compatible, but until a better api is found...\n
// XXX Not jIO compatible, but until a better api is found...\n
"list_method_template": field_json.list_method_template,\n
"list_method_template": field_json.list_method_template,\n
"query":
new URI(field_json.query).query(true).query +
query_string,\n
"query": query_string,\n
"limit": [begin_from, lines + 1],\n
"limit": [begin_from, lines + 1],\n
"select_list": select_list\n
"select_list": select_list\n
}).push(function (result) {\n
}).push(function (result) {\n
...
@@ -604,7 +608,7 @@
...
@@ -604,7 +608,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
946.
44927.40202.16725
</string>
</value>
<value>
<string>
946.
56368.46897.8174
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -622,7 +626,7 @@
...
@@ -622,7 +626,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
144
5939419.71
</float>
<float>
144
6565852.84
</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