MGR-142

appNG · Aug 19, 2022 · 144d6ad · 144d6ad
1 parent e4cac88
commit 144d6ad
Show file tree

Hide file tree

Showing 7 changed files with 388 additions and 405 deletions.
diff --git a/application-home/conf/datasources/ds-sites.xml b/application-home/conf/datasources/ds-sites.xml
@@ -9,11 +9,6 @@
 			<permissions>
 				<permission ref="site.list" mode="set" />
 			</permissions>
-			<params>
-				<param name="name" />
-				<param name="domain" />
-				<param name="active" />
-			</params>
 			<meta-data bindClass="org.appng.api.model.Site">
 				<field name="name" type="text">
 					<sort prio="0" order="asc" ignore-case="true" />
@@ -110,9 +105,7 @@
 				</link>
 			</linkpanel>
 		</config>
-		<bean id="sites">
-			<option name="site" siteName="${name}" siteDomain="${domain}" siteActive="${active}"/>
-		</bean>
+		<bean id="sites" />
 	</datasource>
 
 	<datasource id="site">

diff --git a/application-home/conf/pages/pg-sites.xml b/application-home/conf/pages/pg-sites.xml
@@ -53,11 +53,6 @@
 				<element>
 					<datasource id="sites">
 						<condition expression="${empty action}" />
-						<params>
-							<param name="name">${f_sn}</param>
-							<param name="domain">${f_sd}</param>
-							<param name="active">${f_sa}</param>
-						</params>
 					</datasource>
 				</element>
 			</section>

diff --git a/src/main/java/org/appng/application/manager/business/Sites.java b/src/main/java/org/appng/application/manager/business/Sites.java
@@ -29,6 +29,7 @@
 import org.appng.api.model.Site;
 import org.appng.application.manager.MessageConstants;
 import org.appng.application.manager.form.SiteForm;
+import org.appng.application.manager.service.ManagerService;
 import org.appng.application.manager.service.Service;
 import org.appng.application.manager.service.ServiceAware;
 import org.appng.core.controller.messaging.ReloadSiteEvent;
@@ -127,9 +128,9 @@ public DataContainer getData(Site site, Application application, Environment env
 			data = service.getNewSite(fp);
 		} else {
 			try {
-				String name = options.getString(SITE, "siteName");
-				String domain = options.getString(SITE, "siteDomain");
-				String active = StringUtils.trimToNull(options.getString(SITE, "siteActive"));
+				String name = request.getParameter(ManagerService.FILTER_SITE_NAME);
+				String domain = request.getParameter(ManagerService.FILTER_SITE_DOMAIN);
+				String active = StringUtils.trimToNull(request.getParameter(ManagerService.FILTER_SITE_ACTIVE));
 				data = service.searchSites(environment, fp, siteId, name, domain,
 						StringUtils.defaultString(active, "all"));
 			} catch (BusinessException e) {

diff --git a/src/main/java/org/appng/application/manager/service/ManagerService.java b/src/main/java/org/appng/application/manager/service/ManagerService.java
@@ -150,9 +150,9 @@ public class ManagerService extends CoreService implements Service {
 
 	private Logger logger = LoggerFactory.getLogger(ManagerService.class);
 	private static final String FILTER_GROUP_NAME = "f_gn";
-	private static final String FILTER_SITE_NAME = "f_sn";
-	private static final String FILTER_SITE_DOMAIN = "f_sd";
-	private static final String FILTER_SITE_ACTIVE = "f_sa";
+	public static final String FILTER_SITE_NAME = "f_sn";
+	public static final String FILTER_SITE_DOMAIN = "f_sd";
+	public static final String FILTER_SITE_ACTIVE = "f_sa";
 
 	private SelectionFactory selectionFactory;
 	private OptionGroupFactory optionGroupFactory;

diff --git a/src/test/java/org/appng/application/manager/business/SitesTest.java b/src/test/java/org/appng/application/manager/business/SitesTest.java
@@ -25,6 +25,7 @@
 import org.appng.api.support.CallableDataSource;
 import org.appng.application.manager.form.PropertyForm;
 import org.appng.application.manager.form.SiteForm;
+import org.appng.application.manager.service.ManagerService;
 import org.appng.core.domain.PropertyImpl;
 import org.appng.core.domain.SiteImpl;
 import org.appng.testsupport.validation.WritingXmlValidator;
@@ -149,8 +150,11 @@ public void testShowSites() throws Exception {
 
 	@Test
 	public void testShowSitesFiltered() throws Exception {
-		CallableDataSource siteDatasource = getDataSource("sites").withParam("name", "site")
-				.withParam("domain", "example").withParam("active", "true").getCallableDataSource();
+		addParameter(ManagerService.FILTER_SITE_NAME, "site");
+		addParameter(ManagerService.FILTER_SITE_DOMAIN, "example");
+		addParameter(ManagerService.FILTER_SITE_ACTIVE, "true");
+		initParameters();
+		CallableDataSource siteDatasource = getDataSource("sites").getCallableDataSource();
 		siteDatasource.perform("test");
 
 		validate(siteDatasource.getDatasource());