From: Wouter Z. <dra...@us...> - 2004-03-25 10:43:26
|
User: draftdog Date: 04/03/25 02:32:37 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: the securityEnabled property is now taken into account, it must be "true" for rendering security related code Revision Changes Path No revision No revision 1.5.2.38 +6 -6 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.37 retrieving revision 1.5.2.38 diff -u -w -r1.5.2.37 -r1.5.2.38 --- StrutsJSP.vsl 25 Mar 2004 00:51:20 -0000 1.5.2.37 +++ StrutsJSP.vsl 25 Mar 2004 10:32:36 -0000 1.5.2.38 @@ -10,7 +10,8 @@ #set ($triggerKey = $action.actionTrigger.triggerKey) #set ($parameters = $action.actionParameters) #set ($formBeanName = $action.activityGraph.useCase.formBeanName) -#if ($roles != "") +#set ($security = ($securityEnabled=="true") && ($roles != "") ) +#if ($security) ${indent}<logic:present role="$roles"> #end #set ($mapName = "$str.toJavaMethodName($triggerKey)Parameters") @@ -45,7 +46,7 @@ #end #end ${indent}</table> -#if ($roles != "") +#if ($security) ${indent}</logic:present> ${indent}<logic:notPresent role="$roles"> ${indent} <bean:message key="${action.messageKey}.$triggerKey"/> @@ -62,7 +63,8 @@ #set ($messageKey = $action.messageKey) #set ($trigger = $action.actionTrigger) #set ($roles = $action.actionRoles) -#if ($roles != "") +#set ($security = ($securityEnabled=="true") && ($roles != "") ) +#if ($security) ${indent}<logic:present role="$roles"> #end ${indent} <html:submit titleKey="${messageKey}.$trigger.titleKey"> @@ -73,10 +75,8 @@ ${indent} <bean:message key="${messageKey}.$trigger.resetMessageKey"/> ${indent} </html:reset> #end -#if ($roles != "") +#if ($security) ${indent}</logic:present> -#end -#if ($roles != "") ${indent}<logic:notPresent role="$roles"> ${indent} <html:submit titleKey="${messageKey}.$trigger.notAllowedTitleKey" disabled="true"> ${indent} <bean:message key="${messageKey}.$trigger.triggerKey"/> |