From 4427ce1f897ad208997c5b29c8688fb9401c178a Mon Sep 17 00:00:00 2001 From: Julian de Anquin Date: Tue, 14 Feb 2017 13:54:45 -0300 Subject: [PATCH] AMP-25115 put activity in session scope so permission uses that to check if the edit button should be displayed --- .../src/org/digijava/module/aim/action/EditActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amp/WEB-INF/src/org/digijava/module/aim/action/EditActivity.java b/amp/WEB-INF/src/org/digijava/module/aim/action/EditActivity.java index d8cdbdd9d8d..8b17217523b 100644 --- a/amp/WEB-INF/src/org/digijava/module/aim/action/EditActivity.java +++ b/amp/WEB-INF/src/org/digijava/module/aim/action/EditActivity.java @@ -128,6 +128,7 @@ import org.digijava.module.esrigis.helpers.DbHelper; import org.digijava.module.esrigis.helpers.MapConstants; import org.digijava.module.gateperm.core.GatePermConst; +import org.digijava.module.gateperm.util.PermissionUtil; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -301,6 +302,7 @@ public ActionForward execute(ActionMapping mapping, ActionForm form, } Map scope=new HashMap(); scope.put(GatePermConst.ScopeKeys.CURRENT_MEMBER, tm); + PermissionUtil.putInScope(session, GatePermConst.ScopeKeys.ACTIVITY, activity); gatePermEditAllowed = activity.canDo(GatePermConst.Actions.EDIT, scope); } }