Merge pull request #762 from devgateway/bug/AMP-25540/edit-button212610

ginchauspe · web-flow · commit 0e5a371a476f · 2017-03-01T09:30:25.000-03:00
AMP-25540 always check permissions for edit button not only for non m…
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/visibility/FeatureVisibilityTag.java b/amp/WEB-INF/src/org/dgfoundation/amp/visibility/FeatureVisibilityTag.java
@@ -142,7 +142,7 @@ public boolean shouldDisplayFeature() throws JspTagException
 					Map scope=PermissionUtil.getScope(pageContext.getSession());
 					AmpFeaturesVisibility ampFeatureFromTree=ampTreeVisibility.getFeatureByNameFromRoot(getName());
 					TeamMember teamMember 	= (TeamMember) session.getAttribute(org.digijava.module.aim.helper.Constants.CURRENT_MEMBER);
-					if (teamMember!=null && !teamMember.getTeamHead())
+					if (teamMember!=null )//&& !teamMember.getTeamHead())
 					{
 						PermissionUtil.putInScope(session, GatePermConst.ScopeKeys.CURRENT_MEMBER, teamMember);
 						ServletRequest request = pageContext.getRequest();

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public boolean shouldDisplayFeature() throws JspTagException`
`142`	`142`	`Map scope=PermissionUtil.getScope(pageContext.getSession());`
`143`	`143`	`AmpFeaturesVisibility ampFeatureFromTree=ampTreeVisibility.getFeatureByNameFromRoot(getName());`
`144`	`144`	`TeamMember teamMember = (TeamMember) session.getAttribute(org.digijava.module.aim.helper.Constants.CURRENT_MEMBER);`
`145`		`- if (teamMember!=null && !teamMember.getTeamHead())`
	`145`	`+ if (teamMember!=null )//&& !teamMember.getTeamHead())`
`146`	`146`	`{`
`147`	`147`	`PermissionUtil.putInScope(session, GatePermConst.ScopeKeys.CURRENT_MEMBER, teamMember);`
`148`	`148`	`ServletRequest request = pageContext.getRequest();`