Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 100f50fb
authored
Oct 24, 2013
by
Antti Tonkyra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix inital menu build
1 parent
b64c632f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
View file @
100f50f
...
@@ -91,7 +91,8 @@ public class PrimeMenuView extends GenericCDIView {
...
@@ -91,7 +91,8 @@ public class PrimeMenuView extends GenericCDIView {
{
{
menuModel
=
new
DefaultMenuModel
();
menuModel
=
new
DefaultMenuModel
();
MenuNavigation
selectedTop
=
layoutview
.
getSelectedTopmenu
();
MenuNavigation
selectedTop
=
layoutview
.
getSelectedTopmenu
();
if
(
selectedTop
==
null
)
return
null
;
for
(
MenuNavigation
m
:
selectedTop
.
getChildren
())
{
for
(
MenuNavigation
m
:
selectedTop
.
getChildren
())
{
if
(
m
.
getItem
()
!=
null
&&
m
.
getChildren
().
isEmpty
())
{
if
(
m
.
getItem
()
!=
null
&&
m
.
getChildren
().
isEmpty
())
{
DefaultMenuItem
menuitem
=
mkMenuitem
(
m
);
DefaultMenuItem
menuitem
=
mkMenuitem
(
m
);
...
...
code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java
View file @
100f50f
...
@@ -75,7 +75,8 @@ public class LayoutView {
...
@@ -75,7 +75,8 @@ public class LayoutView {
{
{
selectedSet
=
new
HashSet
<>();
selectedSet
=
new
HashSet
<>();
selectedTop
=
menubean
.
findNavigation
(
getPagepath
());
selectedTop
=
menubean
.
findNavigation
(
getPagepath
());
if
(
selectedTop
==
null
)
return
null
;
while
(
selectedTop
.
getParent
()
!=
null
)
{
while
(
selectedTop
.
getParent
()
!=
null
)
{
logger
.
info
(
"Traversing to top {}, key {}"
,
selectedTop
,
selectedTop
.
getKey
());
logger
.
info
(
"Traversing to top {}, key {}"
,
selectedTop
,
selectedTop
.
getKey
());
selectedSet
.
add
(
selectedTop
);
selectedSet
.
add
(
selectedTop
);
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment