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

Fixed listing of controllers

Browse source
This commit is contained in:
Ziver Koc 2021-06-08 23:51:28 +02:00
parent 1cc834f089
commit cf795be35f
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hal-core/resource/resource/web/plugin_config.tmpl
View file

@ -2,7 +2,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="panel panel-default drop-shadow"> <div class="panel panel-default drop-shadow">
<div class="panel-heading">Active plugins</div> <div class="panel-heading">Detected Plugins</div>
<div class="panel-body"> <div class="panel-body">
<table class="table table-hover table-condensed"> <table class="table table-hover table-condensed">

11
hal-core/src/se/hal/page/PluginConfigWebPage.java
View file

@ -5,9 +5,11 @@ import se.hal.HalServer;
import se.hal.intf.HalAbstractController; import se.hal.intf.HalAbstractController;
import se.hal.intf.HalAbstractControllerManager; import se.hal.intf.HalAbstractControllerManager;
import se.hal.intf.HalWebPage; import se.hal.intf.HalWebPage;
import zutil.ObjectUtil;
import zutil.io.file.FileUtil; import zutil.io.file.FileUtil;
import zutil.parser.Templator; import zutil.parser.Templator;
import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -48,7 +50,14 @@ public class PluginConfigWebPage extends HalWebPage {
List<HalAbstractController> controllers = new LinkedList<>(); List<HalAbstractController> controllers = new LinkedList<>();
for (HalAbstractControllerManager manager : HalServer.getControllerManagers()) { for (HalAbstractControllerManager manager : HalServer.getControllerManagers()) {
controllers.addAll(manager.getControllers()); Collection<HalAbstractController> managerControllers = manager.getControllers();
if (!ObjectUtil.isEmpty(managerControllers)) {
for (HalAbstractController controller : managerControllers) {
if (!controllers.contains(controller))
controllers.add(controller);
}
}
} }
Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); Templator tmpl = new Templator(FileUtil.find(TEMPLATE));