From d4007dff38b1857e59fc8ec6dbec25c2a3d6ae02 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Thu, 25 Mar 2021 14:21:58 +0800
Subject: [PATCH] Adapters

---
 .../org/maxkey/web/apps/contorller/AdaptersController.java | 7 +++++--
 .../templates/views/apps/adapters/selectAdaptersList.ftl   | 5 +++--
 .../main/resources/templates/views/apps/appAddCommon.ftl   | 2 +-
 .../resources/templates/views/apps/appUpdateCommon.ftl     | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

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 97436c6c..b0092a08 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 aa0724bf..41f0f8e9 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 @@
 	<div id="tool_box">
 	 		<table   class="datatable">
  				<tr>
-		 			<td width="120px"><@locale code="role.name"/>:</td>
+		 			<td width="120px"><@locale code="apps.adapter.name"/>:</td>
 		 			<td width="374px">
 		 				<form id="basic_search_form">
 				 			<input class="form-control" type="text" name="name" style ="width:150px;float: left;">
+				 			<input class="form-control" type="hidden" name="protocol" style ="width:150px;float: left;" value="${protocol!}">
 				 			<input class="button btn btn-success mr-3"  id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
 				 		</form>
 		 			</td>
@@ -62,7 +63,7 @@
 		<thead>
 			<tr>
 				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="1false"><@locale code="common.text.id"/></th>
+				<th data-sortable="true" data-field="id"   data-visible="false"><@locale code="common.text.id"/></th>
 				<th data-field="name"><@locale code="apps.adapter.name"/></th>
 				<th data-field="protocol" ><@locale code="apps.adapter.protocol"/></th>
 				<th data-field="adapter"       data-visible="false"><@locale code="apps.adapter.adapter"/></th>
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 94939c4f..d4a5e495 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 @@
 			
 			<input class="button btn btn-success mr-3 window" style="float: left;" id="selectAdaptersBtn" type="button" 
          			value="<@locale code="button.text.select"/>" 
-		 		    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 94bb14c3..f0e980be 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 @@
 			
 			<input class="button btn btn-success mr-3 window" style="float: left;" id="selectAdaptersBtn" type="button" 
          			value="<@locale code="button.text.select"/>" 
-		 		    wurl="<@base/>/apps/adapters/selectAdaptersList"
+		 		    wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}"
 		 		    wwidth="750"
 		 		    wheight="600"
 	 		    	target="window">