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
iv
erp5
Commits
7dbbded3
Commit
7dbbded3
authored
Oct 05, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Redirecting is not blocking anymore
parent
b5a0e5de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
14 deletions
+17
-14
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
+15
-12
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 @
7dbbded3
...
@@ -609,18 +609,21 @@
...
@@ -609,18 +609,21 @@
thead_template
=
listbox_hidden_thead_template
;
thead_template
=
listbox_hidden_thead_template
;
tbody_template
=
listbox_hidden_tbody_template
;
tbody_template
=
listbox_hidden_tbody_template
;
}
}
return
RSVP
.
all
([
return
new
RSVP
.
Queue
()
renderListboxThead
(
gadget
,
thead_template
),
.
push
(
function
()
{
renderListboxTbody
(
gadget
,
tbody_template
),
return
RSVP
.
all
([
renderListboxTfoot
(
gadget
,
listbox_tfoot_template
),
renderListboxThead
(
gadget
,
thead_template
),
gadget
.
translate
(
hide_button_html
)
renderListboxTbody
(
gadget
,
tbody_template
),
]);
renderListboxTfoot
(
gadget
,
listbox_tfoot_template
),
})
gadget
.
translate
(
hide_button_html
)
.
push
(
function
(
all_innerHTML
)
{
]);
//change hide button's text
})
hide_button
.
innerHTML
=
all_innerHTML
[
3
];
.
push
(
function
(
all_innerHTML
)
{
gadget
.
props
.
element
.
querySelector
(
"
.thead
"
).
innerHTML
=
all_innerHTML
[
0
];
//change hide button's text
gadget
.
props
.
element
.
querySelector
(
"
.tfoot
"
).
innerHTML
=
all_innerHTML
[
2
];
hide_button
.
innerHTML
=
all_innerHTML
[
3
];
gadget
.
props
.
element
.
querySelector
(
"
.thead
"
).
innerHTML
=
all_innerHTML
[
0
];
gadget
.
props
.
element
.
querySelector
(
"
.tfoot
"
).
innerHTML
=
all_innerHTML
[
2
];
});
});
});
}
}
);
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
7dbbded3
...
@@ -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
2.33120.49574.44270
</string>
</value>
<value>
<string>
95
4.25745.6524.38843
</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>
14
68331648.73
</float>
<float>
14
75666953.92
</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