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

bugfixes

Browse source
This commit is contained in:
Ziver Koc 2015-06-03 15:19:58 +00:00
parent ab7296198a
commit b5c3c18e28
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,7 @@ public class WAAbstractPage implements HttpPage{
if(page != null) if(page != null)
content = page.htmlResponse(context, client_info, session, cookie, request); content = page.htmlResponse(context, client_info, session, cookie, request);
if(content != null) { if(content != null) {
tmpl.set("nav", context.getBreadcrumb().get(1)); content.set("nav", context.getBreadcrumb().get(1));
tmpl.set("content", content.compile()); tmpl.set("content", content.compile());
} }

2
src/wa/server/page/ServicePage.java
View file

@ -56,7 +56,7 @@ public class ServicePage implements WAPage {
WANavigation nav = new WANavigation(NAVIGATION_NAME, this); WANavigation nav = new WANavigation(NAVIGATION_NAME, this);
for(WAService plugin : services) { for(WAService plugin : services) {
nav.addSubNav(new WANavigation(plugin.getName())); nav.addSubNav(new WANavigation(plugin.getName(), plugin));
statuses.add(new ServiceStatusPage(plugin.getStatus())); statuses.add(new ServiceStatusPage(plugin.getStatus()));
} }
WANavigation.addRootNav(nav); WANavigation.addRootNav(nav);

1
src/wa/server/page/StatusPage.java
View file

@ -59,7 +59,6 @@ public class StatusPage implements WAPage {
Map<String, String> request) { Map<String, String> request) {
WAStatus obj = getPlugin(context); WAStatus obj = getPlugin(context);
if(obj != null) { if(obj != null) {
return new Templator(obj.html()); return new Templator(obj.html());
} }