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
1
Merge Requests
1
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
Vincent Bechu
erp5
Commits
2c337082
Commit
2c337082
authored
May 14, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] No need to asynchronously calculate false value
parent
7dd8b27a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
...emplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
+6
-4
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
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
2c337082
...
@@ -502,8 +502,6 @@
...
@@ -502,8 +502,6 @@
url_promise_list
.
push
(
url_promise_list
.
push
(
gadget
.
getUrlFor
(
content_value
.
url_value
)
gadget
.
getUrlFor
(
content_value
.
url_value
)
);
);
}
else
{
url_promise_list
.
push
(
false
);
}
}
}
}
}
}
...
@@ -540,8 +538,12 @@
...
@@ -540,8 +538,12 @@
//url column
//url column
// get url value
// get url value
if
(
value
.
url_value
)
{
if
(
value
.
url_value
)
{
url_value
=
url_column_list
[
index
];
if
(
value
.
url_value
.
command
)
{
index
+=
1
;
url_value
=
url_column_list
[
index
];
index
+=
1
;
}
else
{
url_value
=
false
;
}
}
else
{
}
else
{
url_value
=
line_link_list
[
i
];
url_value
=
line_link_list
[
i
];
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
2c337082
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
967.347
73.44940.64000
</string>
</value>
<value>
<string>
967.347
96.62500.30566
</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>
152629
0094.25
</float>
<float>
152629
1513.71
</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