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
francois
erp5
Commits
da8f4b5f
Commit
da8f4b5f
authored
Mar 16, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Do not call changeState recursively, or it blocks the UI
parent
a3362a62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
16 deletions
+25
-16
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
+23
-14
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 @
da8f4b5f
...
@@ -98,6 +98,27 @@
...
@@ -98,6 +98,27 @@
return
this
.
changeState
(
state_dict
);
return
this
.
changeState
(
state_dict
);
})
})
.
declareJob
(
'
detachChangeState
'
,
function
(
value_uid
,
catalog_index
)
{
var
gadget
=
this
;
return
gadget
.
jio_allDocs
({
"
query
"
:
Query
.
objectToSearchText
(
new
SimpleQuery
({
key
:
"
catalog.uid
"
,
value
:
value_uid
})),
"
limit
"
:
[
0
,
1
],
"
select_list
"
:
[
catalog_index
]
})
.
push
(
function
(
result
)
{
return
gadget
.
changeState
({
value_text
:
result
.
data
.
rows
[
0
]
.
value
[
catalog_index
]
});
})
.
push
(
function
()
{
return
gadget
.
notifyChange
();
});
})
.
onStateChange
(
function
(
modification_dict
)
{
.
onStateChange
(
function
(
modification_dict
)
{
var
gadget
=
this
,
var
gadget
=
this
,
queue
=
new
RSVP
.
Queue
(),
queue
=
new
RSVP
.
Queue
(),
...
@@ -145,20 +166,8 @@
...
@@ -145,20 +166,8 @@
// User selected a document from a listbox
// User selected a document from a listbox
if
((
gadget
.
state
.
value_uid
)
&&
(
!
gadget
.
state
.
value_text
))
{
if
((
gadget
.
state
.
value_uid
)
&&
(
!
gadget
.
state
.
value_text
))
{
plane
.
className
=
SEARCHING_CLASS_STR
;
plane
.
className
=
SEARCHING_CLASS_STR
;
return
gadget
.
jio_allDocs
({
return
gadget
.
detachChangeState
(
gadget
.
state
.
value_uid
,
"
query
"
:
Query
.
objectToSearchText
(
new
SimpleQuery
({
gadget
.
state
.
catalog_index
);
key
:
"
catalog.uid
"
,
value
:
gadget
.
state
.
value_uid
,
limit
:
[
0
,
1
]
})),
"
select_list
"
:
[
gadget
.
state
.
catalog_index
]
})
.
push
(
function
(
result
)
{
return
gadget
.
changeState
({
value_text
:
result
.
data
.
rows
[
0
]
.
value
[
gadget
.
state
.
catalog_index
]
});
});
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.xml
View file @
da8f4b5f
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
95
5.62393.33328.520
19
</string>
</value>
<value>
<string>
95
8.2831.13618.122
19
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
148
1711639.59
</float>
<float>
148
9675175.72
</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