Merge pull request #2753 from devgateway/hotfix/v3.3.3

AMP-28844 AMP 3.3.3 release
devgateway · Jan 23, 2019 · 5267b75 · 5267b75
2 parents 5629638 + d09253a
commit 5267b75
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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 "22.01.2019">
+<!ENTITY releaseDate "23.01.2019">
 <!ENTITY buildDate "${buildDate}">
 <!ENTITY buildSource "${buildSource}">
 ]>

diff --git a/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java b/amp/WEB-INF/src/org/digijava/module/aim/util/ActivityUtil.java
@@ -2197,7 +2197,7 @@ public static List<Long> getUnvalidatedActivityIds() {
      */
     public static List<Long> getEditableActivityIdsNoSession(TeamMember tm) {
         AmpTeamMember ampTeamMember = TeamMemberUtil.getAmpTeamMember(tm.getMemberId());
-        AmpARFilter ampARFilter = FilterUtil.buildFilterFromSource(ampTeamMember.getAmpTeam());
+        AmpARFilter ampARFilter = FilterUtil.buildFilterFromSource(ampTeamMember.getAmpTeam(), tm);
         AmpARFilterParams params = AmpARFilterParams.getParamsForWorkspaceFilter(ampTeamMember.toTeamMember(), null);
         ampARFilter.generateFilterQuery(params);
         String query = ampARFilter.getGeneratedFilterQuery();

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.3.2</version>
+    <version>3.3.3</version>
     <packaging>war</packaging>
     <name>Aid Management Platform</name>
     <properties>