Added enabled to critera when returning systems

skavanagh · skavanagh · commit 3e2730b72217 · 2017-03-16T20:57:36.000-04:00
Added enabled to critera when returning systems by profile
diff --git a/src/main/java/com/keybox/manage/db/ProfileDB.java b/src/main/java/com/keybox/manage/db/ProfileDB.java
@@ -58,7 +58,7 @@ public static SortedSet getProfileSet(SortedSet sortedSet) {
         }
         String sql = "select distinct p.* from  profiles p ";
         if (StringUtils.isNotEmpty(sortedSet.getFilterMap().get(FILTER_BY_SYSTEM))) {
-           sql = sql + ", system_map m, system s where m.profile_id = p.id and m.system_id = s.id" +
+           sql = sql + ", system_map m, system s where s.enabled=true and m.profile_id = p.id and m.system_id = s.id" +
                    " and (lower(s.display_nm) like ? or lower(s.host) like ?)";
         } else if (StringUtils.isNotEmpty(sortedSet.getFilterMap().get(FILTER_BY_USER))) {
             sql = sql + ", user_map m, users u where m.profile_id = p.id and m.user_id = u.id" +
diff --git a/src/main/java/com/keybox/manage/db/ProfileSystemsDB.java b/src/main/java/com/keybox/manage/db/ProfileSystemsDB.java
@@ -86,7 +86,7 @@ public static List<HostSystem> getSystemsByProfile(Connection con, Long profileI
 
 
 		try {
-			PreparedStatement stmt = con.prepareStatement("select * from  system s, system_map m where s.id=m.system_id and m.profile_id=? order by display_nm asc");
+			PreparedStatement stmt = con.prepareStatement("select * from  system s, system_map m where s.enabled=true and s.id=m.system_id and m.profile_id=? order by display_nm asc");
 			stmt.setLong(1, profileId);
 			ResultSet rs = stmt.executeQuery();
 
@@ -149,7 +149,7 @@ public static List<Long> getSystemIdsByProfile(Connection con, Long profileId) {
 
 
 		try {
-			PreparedStatement stmt = con.prepareStatement("select * from  system s, system_map m where s.id=m.system_id and m.profile_id=? order by display_nm asc");
+			PreparedStatement stmt = con.prepareStatement("select * from  system s, system_map m where s.enabled=true and s.id=m.system_id and m.profile_id=? order by display_nm asc");
 			stmt.setLong(1, profileId);
 			ResultSet rs = stmt.executeQuery();
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public static SortedSet getProfileSet(SortedSet sortedSet) {`
`58`	`58`	`}`
`59`	`59`	`String sql = "select distinct p.* from profiles p ";`
`60`	`60`	`if (StringUtils.isNotEmpty(sortedSet.getFilterMap().get(FILTER_BY_SYSTEM))) {`
`61`		`- sql = sql + ", system_map m, system s where m.profile_id = p.id and m.system_id = s.id" +`
	`61`	`+ sql = sql + ", system_map m, system s where s.enabled=true and m.profile_id = p.id and m.system_id = s.id" +`
`62`	`62`	`" and (lower(s.display_nm) like ? or lower(s.host) like ?)";`
`63`	`63`	`} else if (StringUtils.isNotEmpty(sortedSet.getFilterMap().get(FILTER_BY_USER))) {`
`64`	`64`	`sql = sql + ", user_map m, users u where m.profile_id = p.id and m.user_id = u.id" +`