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
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roque
erp5
Commits
ff7e889b
Commit
ff7e889b
authored
Sep 13, 2017
by
Tomáš Peterka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[renderjs_ui] RJS Header clears buttons when page title or icon is changed
parent
8c5ab2e5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
11 deletions
+7
-11
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_header_js.js
+5
-9
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.js
View file @
ff7e889b
...
@@ -143,15 +143,6 @@
...
@@ -143,15 +143,6 @@
sub_header_list
=
[],
sub_header_list
=
[],
i
;
i
;
if
(
options
.
hasOwnProperty
(
"
page_title
"
))
{
// if a new page title is specified then we are displaying different
// view so we force-reload all menu buttons
state
.
main_link
=
{};
state
.
right_link
=
{};
state
.
right_button
=
{};
state
.
left_button
=
{};
}
// Main title
// Main title
if
(
options
.
hasOwnProperty
(
"
page_title
"
)
||
options
.
hasOwnProperty
(
"
page_icon
"
))
{
if
(
options
.
hasOwnProperty
(
"
page_title
"
)
||
options
.
hasOwnProperty
(
"
page_icon
"
))
{
state
.
main_link
=
{
state
.
main_link
=
{
...
@@ -165,6 +156,11 @@
...
@@ -165,6 +156,11 @@
state
.
main_link
.
url
=
options
[
possible_main_link_list
[
i
][
0
]];
state
.
main_link
.
url
=
options
[
possible_main_link_list
[
i
][
0
]];
}
}
}
}
// if a new page title|icon is specified then we clear all menu buttons
// because the view changed completely
state
.
right_link
=
{};
state
.
right_button
=
{};
state
.
left_button
=
{};
}
}
// Left button
// Left button
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_header_js.xml
View file @
ff7e889b
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
1.62564.2001.5468
1
</string>
</value>
<value>
<string>
96
2.1014.20681.802
1
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
150
4882942.48
</float>
<float>
150
5297561.5
</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