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
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
759e7254
Commit
759e7254
authored
Sep 22, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: do not use the form context title when the current jio_key is different
parent
dabf767a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_global_js.js
+8
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_global_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.js
View file @
759e7254
...
@@ -11,13 +11,19 @@
...
@@ -11,13 +11,19 @@
function
calculateSynchronousPageTitle
(
gadget
,
erp5_document
)
{
function
calculateSynchronousPageTitle
(
gadget
,
erp5_document
)
{
var
title
=
erp5_document
.
title
,
var
title
=
erp5_document
.
title
,
portal_type
=
erp5_document
.
_links
.
type
.
name
,
portal_type
=
erp5_document
.
_links
.
type
.
name
,
is_module
=
/ Module$/
.
test
(
erp5_document
.
_links
.
type
.
href
);
is_module
=
/ Module$/
.
test
(
erp5_document
.
_links
.
type
.
href
),
traversed_document_jio_key
;
if
(
erp5_document
.
_links
.
hasOwnProperty
(
'
traversed_document
'
))
{
traversed_document_jio_key
=
erp5_document
.
_links
.
traversed_document
.
name
;
}
if
((
!
is_module
)
&&
if
((
!
is_module
)
&&
erp5_document
.
hasOwnProperty
(
'
_embedded
'
)
&&
erp5_document
.
hasOwnProperty
(
'
_embedded
'
)
&&
erp5_document
.
_embedded
.
hasOwnProperty
(
'
_view
'
)
&&
erp5_document
.
_embedded
.
hasOwnProperty
(
'
_view
'
)
&&
erp5_document
.
_embedded
.
_view
.
hasOwnProperty
(
'
_links
'
)
&&
erp5_document
.
_embedded
.
_view
.
hasOwnProperty
(
'
_links
'
)
&&
erp5_document
.
_embedded
.
_view
.
_links
.
hasOwnProperty
(
'
traversed_document
'
))
{
erp5_document
.
_embedded
.
_view
.
_links
.
hasOwnProperty
(
'
traversed_document
'
)
&&
traversed_document_jio_key
===
erp5_document
.
_embedded
.
_view
.
_links
.
traversed_document
.
name
)
{
// When refreshing the page (after Base_edit), only the form content is recalculated
// When refreshing the page (after Base_edit), only the form content is recalculated
// and erp5_document.title may contain the old title value.
// and erp5_document.title may contain the old title value.
// Get the title value from the calculated form if possible
// Get the title value from the calculated form if possible
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_global_js.xml
View file @
759e7254
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
98
4.43757.43474.9898
</string>
</value>
<value>
<string>
98
6.50941.53340.16930
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
592560913.76
</float>
<float>
1
600761755.69
</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