AMP-30337 filter out projects with undefined sectors from Dashboard p…

…roject list
devgateway · Aug 2, 2022 · 47f82bd · 47f82bd
1 parent 59ac014
commit 47f82bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/amp/TEMPLATE/ampTemplate/site-config.xml b/amp/TEMPLATE/ampTemplate/site-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE page [
 <!ENTITY ampVersion "${project.version}">
-<!ENTITY releaseDate "30.07.2021">
+<!ENTITY releaseDate "02.08.2022">
 <!ENTITY buildDate "${buildDate}">
 <!ENTITY buildSource "${buildSource}">
 ]>

diff --git a/...B-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java b/...B-INF/src/org/digijava/kernel/ampapi/endpoints/dashboards/services/DashboardsService.java
@@ -52,6 +52,8 @@
 import org.digijava.module.categorymanager.util.CategoryConstants;
 import org.digijava.module.categorymanager.util.CategoryManagerUtil;
 
+import static org.dgfoundation.amp.nireports.runtime.ColumnReportData.UNALLOCATED_ID;
+
 /**
  * 
  * @author Diego Dimunzio
@@ -84,7 +86,7 @@ public static int getOffset(DashboardFormParameters config) {
     public static LinkedHashMap<String, Object> setFilterId(Long id, String column) {
         LinkedHashMap<String, Object> filterObject = new LinkedHashMap<String, Object>();
         List<Long> filterIds = new ArrayList<Long>();
-        if (id >0) {
+        if (id > 0 || id.equals(UNALLOCATED_ID)) {
             filterIds.add(id);
             filterObject.put(column, filterIds);
         }
@@ -122,7 +124,7 @@ protected static void postProcessRE(GeneratedReport report, ReportSpecificationI
         for (ReportArea ra : report.reportContents.getChildren()) {
             // detect those undefined for countries, but skip those that are really undefined for regions
             if (ra.getOwner() != null && ra.getOwner().id < 0
-                    && (ra.getOwner().id != ColumnReportData.UNALLOCATED_ID)) {
+                    && (ra.getOwner().id != UNALLOCATED_ID)) {
                 undefinedAreas.add(ra);
             }
         }

diff --git a/amp/pom.xml b/amp/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.devgateway</groupId>
     <artifactId>amp</artifactId>
-    <version>3.4.3.1</version>
+    <version>3.4.3.2</version>
     <packaging>war</packaging>
     <name>Aid Management Platform</name>
     <properties>