diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java index 97436c6cc..b0092a080 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java @@ -32,6 +32,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; @@ -53,8 +54,10 @@ public class AdaptersController { } @RequestMapping(value={"/selectAdaptersList"}) - public ModelAndView selectRolesList(){ - return new ModelAndView("apps/adapters/selectAdaptersList"); + public ModelAndView selectAdaptersList(@RequestParam(name="protocol",required=false) String protocol){ + ModelAndView modelAndView=new ModelAndView("apps/adapters/selectAdaptersList"); + modelAndView.addObject("protocol", protocol); + return modelAndView; } diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/adapters/selectAdaptersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/adapters/selectAdaptersList.ftl index aa0724bfb..41f0f8e97 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/adapters/selectAdaptersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/adapters/selectAdaptersList.ftl @@ -28,10 +28,11 @@
| <@locale code="role.name"/>: | +<@locale code="apps.adapter.name"/>: | @@ -62,7 +63,7 @@ | ||||||
| - | <@locale code="common.text.id"/> | +<@locale code="common.text.id"/> | <@locale code="apps.adapter.name"/> | <@locale code="apps.adapter.protocol"/> | <@locale code="apps.adapter.adapter"/> | diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl index 94939c4fb..d4a5e495a 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl @@ -105,7 +105,7 @@ " - wurl="<@base/>/apps/adapters/selectAdaptersList" + wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}" wwidth="750" wheight="600" target="window"> diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl index 94bb14c33..f0e980be9 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl @@ -108,7 +108,7 @@ " - wurl="<@base/>/apps/adapters/selectAdaptersList" + wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}" wwidth="750" wheight="600" target="window">
|---|