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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
erp5
Commits
4c53cf66
Commit
4c53cf66
authored
Jun 17, 2019
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RELATIONERROR only handle allDocs error
(indentation in next commit)
parent
05ed7201
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
15 deletions
+26
-15
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.js
...Item/web_page_module/rjs_gadget_erp5_relation_input_js.js
+24
-13
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.xml
...tem/web_page_module/rjs_gadget_erp5_relation_input_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.js
View file @
4c53cf66
...
...
@@ -242,7 +242,8 @@
return
RSVP
.
Queue
()
.
push
(
function
()
{
var
plane
=
gadget
.
element
.
querySelector
(
"
a
"
),
ul
=
gadget
.
element
.
querySelector
(
"
.search_ul
"
);
ul
=
gadget
.
element
.
querySelector
(
"
.search_ul
"
),
translation_promise
;
plane
.
href
=
''
;
// uid is known
...
...
@@ -308,8 +309,12 @@
return
RSVP
.
delay
(
200
);
})
.
push
(
function
()
{
return
RSVP
.
all
([
gadget
.
jio_allDocs
({
translation_promise
=
gadget
.
getTranslationList
([
'
Create New
'
,
'
Explore the Search Result List
'
]);
return
gadget
.
jio_allDocs
({
query
:
Query
.
objectToSearchText
(
new
ComplexQuery
({
operator
:
"
AND
"
,
query_list
:
[
...
...
@@ -325,13 +330,12 @@
limit
:
[
0
,
10
],
select_list
:
[
gadget
.
state
.
catalog_index
,
"
uid
"
],
sort_on
:
JSON
.
parse
(
gadget
.
state
.
sort_list_json
)
}),
gadget
.
getTranslationList
([
'
Create New
'
,
'
Explore the Search Result List
'
])
]);
})
})
.
push
(
function
(
result
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
RSVP
.
all
([
result
,
translation_promise
]);
})
.
push
(
function
(
result_list
)
{
var
i
,
row
,
...
...
@@ -394,10 +398,17 @@
ul
.
removeChild
(
ul
.
firstChild
);
}
ul
.
appendChild
(
fragment_element
);
})
.
push
(
undefined
,
function
()
{
return
gadget
.
notifyInvalid
(
"
Invalid search criteria
"
);
});
},
function
(
error
)
{
if
(
error
&&
error
.
hash
&&
error
.
hash
.
expected
&&
error
.
hash
.
expected
.
length
===
1
&&
error
.
hash
.
expected
[
0
]
===
"
'QUOTE'
"
)
{
return
gadget
.
notifyInvalid
(
"
Invalid search criteria
"
);
}
throw
error
;
});
});
});
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.xml
View file @
4c53cf66
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.2
1286.46840.2500
2
</string>
</value>
<value>
<string>
976.2
9948.48865.109
2
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
1560
265812.69
</float>
<float>
1560
785130.18
</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