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
f844b061
Commit
f844b061
authored
Oct 29, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] No need to load the panel before rendering the page
Panel is already closed during bootstrap
parent
921476c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+15
-6
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
f844b061
...
...
@@ -210,6 +210,7 @@
//////////////////////////////////////////
rJS
(
window
)
.
setState
({
panel_visible
:
false
,
setting_id
:
"
setting/
"
+
document
.
head
.
querySelector
(
'
script[data-renderjs-configuration="application_title"]
'
).
textContent
...
...
@@ -474,7 +475,10 @@
return
hideDesktopPanel
(
this
,
param_list
[
0
]);
})
.
allowPublicAcquisition
(
'
triggerPanel
'
,
function
triggerPanel
()
{
return
route
(
this
,
"
panel
"
,
"
toggle
"
);
// Force calling panel toggle
return
this
.
deferChangeState
({
panel_visible
:
new
Date
().
getTime
()
});
})
.
allowPublicAcquisition
(
'
renderEditorPanel
'
,
function
renderEditorPanel
(
param_list
)
{
...
...
@@ -615,6 +619,14 @@
}));
}
// Update the panel state
if
(
modification_dict
.
hasOwnProperty
(
'
panel_visible
'
))
{
if
(
gadget
.
state
.
panel_visible
!==
false
)
{
promise_list
.
push
(
route
(
this
,
'
panel
'
,
"
toggle
"
));
}
else
{
promise_list
.
push
(
route
(
this
,
'
panel
'
,
"
close
"
));
}
}
// Update the editor panel
if
(
modification_dict
.
hasOwnProperty
(
'
editor_panel_url
'
)
||
modification_dict
.
hasOwnProperty
(
'
editor_panel_render_timestamp
'
))
{
...
...
@@ -654,16 +666,13 @@
initPanelOptions
(
gadget
);
return
increaseLoadingCounter
(
gadget
)
.
push
(
function
()
{
var
promise_list
=
[
route
(
gadget
,
'
panel
'
,
'
close
'
),
route
(
gadget
,
'
router
'
,
'
notify
'
,
[{
modified
:
false
}])
];
return
RSVP
.
all
(
promise_list
);
return
route
(
gadget
,
'
router
'
,
'
notify
'
,
[{
modified
:
false
}]);
})
.
push
(
function
()
{
return
gadget
.
changeState
({
url
:
route_result
.
url
,
options
:
route_result
.
options
,
panel_visible
:
false
,
editor_panel_url
:
undefined
,
notification_options
:
(
keep_message
===
true
)
?
gadget
.
state
.
notification_options
:
undefined
,
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
f844b061
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
971.13
370.40868.64819
</string>
</value>
<value>
<string>
971.13
462.12391.28893
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
154056
1732.08
</float>
<float>
154056
7093.15
</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