Fix order and db handling for orgAdmin automatic collabs

WildMeOrg · Mar 1, 2024 · e843320 · e843320
1 parent 783cd19
commit e843320
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/src/main/java/org/ecocean/security/Collaboration.java b/src/main/java/org/ecocean/security/Collaboration.java
@@ -197,14 +197,23 @@ public static List<Collaboration> collaborationsForUser(String context, String u
 		Shepherd myShepherd = new Shepherd(context);
 		myShepherd.setAction("Collaboration.class1");
 		myShepherd.beginDBTransaction();
-		Query query = myShepherd.getPM().newQuery(queryString);
-    //ArrayList got = myShepherd.getAllOccurrences(query);
-		List returnMe=myShepherd.getAllOccurrences(query);
-		query.closeAll();
-		myShepherd.rollbackDBTransaction();
-		myShepherd.closeDBTransaction();
-
-   returnMe=addAssumedOrgAdminCollaborations(returnMe, myShepherd, username);
+		List returnMe=new ArrayList();
+		try {
+  		Query query = myShepherd.getPM().newQuery(queryString);
+      //ArrayList got = myShepherd.getAllOccurrences(query);
+  		returnMe=myShepherd.getAllOccurrences(query);
+  		query.closeAll();
+
+
+     returnMe=addAssumedOrgAdminCollaborations(returnMe, myShepherd, username);
+		}
+		catch(Exception e) {e.printStackTrace();}
+		finally {
+		   myShepherd.rollbackDBTransaction();
+		   myShepherd.closeDBTransaction();
+		}
+
+
 
     return returnMe;
 	}
@@ -407,7 +416,7 @@ public static boolean canUserAccessOwnedObject(String ownerName, HttpServletRequ
 
 		String username = request.getUserPrincipal().getName();
 
-		return canCollaborate(context, ownerName, username);
+		return canCollaborate(context, username, ownerName);
 
 	}
 
@@ -420,7 +429,7 @@ public static boolean canUserAccessEncounter(Encounter enc, HttpServletRequest r
 	public static boolean canUserAccessEncounter(Encounter enc, String context, String username) {
 	  String owner = enc.getAssignedUsername();
 		if (User.isUsernameAnonymous(owner)) return true;  //anon-owned is "fair game" to anyone
-		return canCollaborate(context, owner, username);
+		return canCollaborate(context, username, owner);
 	}
 
 	public static boolean canUserAccessOccurrence(Occurrence occ, HttpServletRequest request) {