ziver/webadmin
1
0
Fork 0
Code Pull requests Releases Activity

enabled active navigation in web

Browse source
This commit is contained in:
Ziver Koc 2016-04-06 17:20:47 +02:00
parent 7eed07da38
commit fc093b3ab8
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/wa/server/WAAbstractPage.java
View file

@ -102,7 +102,7 @@ public class WAAbstractPage implements HttpPage{
tmpl.set("top-nav", context.getNavigationInstance().getSubNavs());
tmpl.set("side-nav-show", true);
if(!breadcrumb.isEmpty())
tmpl.set("side-nav", breadcrumb.get(0).getSubNavs());
tmpl.set("side-nav", breadcrumb.get(0).createNavInstance(request).getSubNavs());
tmpl.set("breadcrumb", breadcrumb);
tmpl.set("alerts", context.getAlerts());
//tmpl.set("footer", null);

9
src/wa/server/page/struct/WANavigation.java
View file

@ -202,5 +202,14 @@ public class WANavigation implements Iterable{
public String getName(){ return nav.getName(); }
public String getUrl(){ return nav.getUrl(); }
public Object getResource(){ return nav.getResource(); }
public boolean equals(Object o){
if (o instanceof WANavigation)
return nav.equals(o);
else if (o instanceof NavInstance)
return nav.equals(((NavInstance) o).nav);
return false;
}
}
}