From 2567b93d3f5b4f6a772914b48efbff21464e0856 Mon Sep 17 00:00:00 2001
From: madness-inc <matthias.mueller@appng.org>
Date: Fri, 17 Dec 2021 14:45:15 +0100
Subject: [PATCH] MGR-130

---
 .../java/org/appng/application/manager/business/Sites.java   | 5 +++--
 .../appng/application/manager/service/ManagerService.java    | 4 ++--
 src/test/resources/xml/SitesTest-testShowSites.xml           | 2 +-
 src/test/resources/xml/SitesTest-testShowSitesFiltered.xml   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/appng/application/manager/business/Sites.java b/src/main/java/org/appng/application/manager/business/Sites.java
index 0e56c44..1140453 100644
--- a/src/main/java/org/appng/application/manager/business/Sites.java
+++ b/src/main/java/org/appng/application/manager/business/Sites.java
@@ -134,8 +134,9 @@ public DataContainer getData(Site site, Application application, Environment env
 			try {
 				String name = options.getString(SITE, "siteName");
 				String domain = options.getString(SITE, "siteDomain");
-				String active = StringUtils.trimToEmpty(options.getString(SITE, "siteActive"));
-				data = service.searchSites(environment, fp, siteId, name, domain, active);
+				String active = StringUtils.trimToNull(options.getString(SITE, "siteActive"));
+				data = service.searchSites(environment, fp, siteId, name, domain,
+						StringUtils.defaultString(active, "all"));
 			} catch (BusinessException e) {
 				String message = request.getMessage(e.getMessageKey(), e.getMessageArgs());
 				log.error(message, 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
index edbea9b..7f61aee 100644
--- a/src/main/java/org/appng/application/manager/service/ManagerService.java
+++ b/src/main/java/org/appng/application/manager/service/ManagerService.java
@@ -979,7 +979,7 @@ public DataContainer searchSites(Environment environment, FieldProcessor fp, Int
 			if (StringUtils.isNotBlank(domain)) {
 				siteQuery.contains("domain", domain);
 			}
-			if (StringUtils.isNotBlank(active)) {
+			if (!"all".equals(active)) {
 				siteQuery.equals("active", Boolean.valueOf(active));
 			}
 			Page<SiteImpl> sites = siteRepository.search(siteQuery, fp.getPageable());
@@ -996,7 +996,7 @@ public DataContainer searchSites(Environment environment, FieldProcessor fp, Int
 					.select(domain).build();
 
 			Map<String, String> activeValues = new HashMap<>();
-			activeValues.put("", "all");
+			activeValues.put("all", "all");
 			activeValues.put("true", "yes");
 			activeValues.put("false", "no");
 			Selection activeFilter = selectionFactory.fromObjects(FILTER_SITE_ACTIVE, MessageConstants.ACTIVE,
diff --git a/src/test/resources/xml/SitesTest-testShowSites.xml b/src/test/resources/xml/SitesTest-testShowSites.xml
index 5d49522..ce6cb7b 100644
--- a/src/test/resources/xml/SitesTest-testShowSites.xml
+++ b/src/test/resources/xml/SitesTest-testShowSites.xml
@@ -118,7 +118,7 @@
 			</selection>
 			<selection id="f_sa" type="radio">
 				<title id="active">Active</title>
-				<option value="" name="all" selected="true" />
+				<option value="all" name="all" selected="true" />
 				<option value="true" name="yes" selected="false" />
 				<option value="false" name="no" selected="false" />
 			</selection>
diff --git a/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml b/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
index 7075545..e6b182e 100644
--- a/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
+++ b/src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
@@ -118,7 +118,7 @@
 			</selection>
 			<selection id="f_sa" type="radio">
                 <title id="active">Active</title>
-                <option value="" name="all" selected="false"/>
+                <option value="all" name="all" selected="false"/>
                 <option value="true" name="yes" selected="true"/>
                 <option value="false" name="no" selected="false"/>
             </selection>