svn commit: r769944 - in /ofbiz/trunk/themes: bluelight/includes/appbar.ftl flatgrey/includes/appbar.ftl flatgrey/includes/footer.ftl smoothfeather/includes/appbar.ftl smoothfeather/includes/secondary-appbar.ftl

[jaz-3]

Author: jaz
Date: Wed Apr 29 21:29:16 2009
New Revision: 769944

URL: http://svn.apache.org/viewvc?rev=769944&view=rev
Log:
integration with Authz Integration with new Authz API - JIRA OFBIZ-2381

Modified:
    ofbiz/trunk/themes/bluelight/includes/appbar.ftl
    ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
    ofbiz/trunk/themes/flatgrey/includes/footer.ftl
    ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl
    ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl

Modified: ofbiz/trunk/themes/bluelight/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbar.ftl?rev=769944&r1=769943&r2=769944&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbar.ftl Wed Apr 29 21:29:16 2009
@@ -36,7 +36,7 @@
               <#assign selected = false>
               <#assign permissions = display.getBasePermission()>
               <#list permissions as perm>
-                <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters, false))>
                   <#-- User must have ALL permissions in the base-permission list -->
                   <#assign permission = false>
                 </#if>

Modified: ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/appbar.ftl?rev=769944&r1=769943&r2=769944&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/appbar.ftl Wed Apr 29 21:29:16 2009
@@ -32,7 +32,7 @@
         <#assign selected = false>
         <#assign permissions = display.getBasePermission()>
         <#list permissions as perm>
-          <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)>
+          <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters, false))>
             <#-- User must have ALL permissions in the base-permission list -->
             <#assign permission = false>
           </#if>

Modified: ofbiz/trunk/themes/flatgrey/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/footer.ftl?rev=769944&r1=769943&r2=769944&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Wed Apr 29 21:29:16 2009
@@ -34,7 +34,7 @@
       <#assign selected = false>
       <#assign permissions = display.getBasePermission()>
       <#list permissions as perm>
-        <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)>
+        <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters, false))>
           <#-- User must have ALL permissions in the base-permission list -->
           <#assign permission = false>
         </#if>

Modified: ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl?rev=769944&r1=769943&r2=769944&view=diff
==============================================================================
--- ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl Wed Apr 29 21:29:16 2009
@@ -33,7 +33,7 @@
               <#assign selected = false>
               <#assign permissions = display.getBasePermission()>
               <#list permissions as perm>
-                <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)>
+                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters, false))>
                   <#-- User must have ALL permissions in the base-permission list -->
                   <#assign permission = false>
                 </#if>

Modified: ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl?rev=769944&r1=769943&r2=769944&view=diff
==============================================================================
--- ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl (original)
+++ ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl Wed Apr 29 21:29:16 2009
@@ -32,7 +32,7 @@
       <#assign selected = false>
       <#assign permissions = display.getBasePermission()>
       <#list permissions as perm>
-        <#if perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session)>
+        <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session) && !authz.hasPermission(session, perm, requestParameters, false))>
           <#-- User must have ALL permissions in the base-permission list -->
           <#assign permission = false>
         </#if>