OFBiz › OFBiz - Commits

svn commit: r808787 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml data/OrderSecurityData.xml webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy webapp/ordermgr/order/orderlist.ftl

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r808787 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml data/OrderSecurityData.xml webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy webapp/ordermgr/order/orderlist.ftl

jleroux@apache.org
Author: jleroux
Date: Fri Aug 28 07:23:05 2009
New Revision: 808787

URL: http://svn.apache.org/viewvc?rev=808787&view=rev
Log:
Fix a bug reported by Cimballi on user ML

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/data/OrderSecurityData.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy
    ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=808787&r1=808786&r2=808787&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Aug 28 07:23:05 2009
@@ -1229,7 +1229,7 @@
     </property>
     <property key="OrderNewShippingAddress">
         <value xml:lang="en">New Shipping Address</value>
-    </property>
+    </property>
     <property key="OrderAddToCart">
         <value xml:lang="cs">přidat do košíku</value>
         <value xml:lang="de">In den Warenkorb legen</value>
@@ -9719,13 +9719,13 @@
         <value xml:lang="en">View Order History</value>
     </property>
     <property key="OrderViewPermissionError">
-        <value xml:lang="de">Sie haben keine Leseberechtigung für diese Seite ("ORDERMGR_VIEW" oder "ORDERMGR_ADMIN" benötigt).</value>
-        <value xml:lang="en">You do not have permission to view this page (it needs "ORDERMGR_VIEW" or "ORDERMGR_ADMIN").</value>
-        <value xml:lang="es">Usted no tiene permiso para ver esta página. (Privilegios como "ORDERMGR_VIEW" u "ORDERMGR_ADMIN" son necesarios)</value>
-        <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page. ("ORDERMGR_VIEW" ou "ORDERMGR_ADMIN" est nécessaire)</value>
-        <value xml:lang="it">Non sei autorizzato a vedere questa pagina. ("ORDERMGR_VIEW", "ORDERMGR_ADMIN" o ruolo associato all'agente Fornitore sono necessari)</value>
+        <value xml:lang="de">Sie haben keine Leseberechtigung für diese Seite ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" oder "ORDERMGR_ADMIN" benötigt).</value>
+        <value xml:lang="en">You do not have permission to view this page (it needs "ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" or "ORDERMGR_ADMIN").</value>
+        <value xml:lang="es">Usted no tiene permiso para ver esta página. (Privilegios como "ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" u "ORDERMGR_ADMIN" son necesarios)</value>
+        <value xml:lang="fr">Vous n'avez pas l'autorisation de voir cette page. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW" ou "ORDERMGR_ADMIN" est nécessaire)</value>
+        <value xml:lang="it">Non sei autorizzato a vedere questa pagina. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW", "ORDERMGR_ADMIN" o ruolo associato all'agente Fornitore sono necessari)</value>
         <value xml:lang="nl">You do not have permission to view this page.</value>
-        <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. ("ORDERMGR_VIEW", "ORDERMGR_ADMIN" un rol asociat la agent Furnizor sunt necesari)</value>
+        <value xml:lang="ro">Nu esti autorizat sa vezi aceasta pagina. ("ORDERMGR_VIEW", "ORDERMGR_PURCHASE_VIEW", "ORDERMGR_ADMIN" un rol asociat la agent Furnizor sunt necesari)</value>
         <value xml:lang="ru">У вас нет прав для просмотра этой страницы.</value>
         <value xml:lang="th">คุณไม่ได้รับการนุญาตให้ดูหน้านี้</value>
         <value xml:lang="zh">你无权浏览这个页面。</value>

Modified: ofbiz/trunk/applications/order/data/OrderSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderSecurityData.xml?rev=808787&r1=808786&r2=808787&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderSecurityData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderSecurityData.xml Fri Aug 28 07:23:05 2009
@@ -99,6 +99,7 @@
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_RETURN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_NOTE"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_VIEW"/>
+    <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_PURCHASE_VIEW"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_QUOTE_PRICE"/>
     <SecurityGroupPermission groupId="FULLADMIN" permissionId="ORDERMGR_CRQ_ADMIN"/>
     <SecurityGroupPermission groupId="FLEXADMIN" permissionId="ORDERMGR_CRQ_CREATE"/>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy?rev=808787&r1=808786&r2=808787&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy Fri Aug 28 07:23:05 2009
@@ -36,7 +36,7 @@
     if (state.hasType("view_SALES_ORDER") || (!(state.hasType("view_SALES_ORDER")) && !(state.hasType("view_PURCHASE_ORDER")))) {
         hasPermission = true;
         salesOrdersCondition = EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER");
-    }
+    }
 }
 if (security.hasEntityPermission("ORDERMGR", "_PURCHASE_VIEW", session)) {
     if (state.hasType("view_PURCHASE_ORDER") || (!(state.hasType("view_SALES_ORDER")) && !(state.hasType("view_PURCHASE_ORDER")))) {

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=808787&r1=808786&r2=808787&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Fri Aug 28 07:23:05 2009
@@ -225,5 +225,5 @@
     </div>
   </div>
 <#else>
-<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
\ No newline at end of file
+  <h3>${uiLabelMap.OrderViewPermissionError}</h3>
+</#if>


Free forum by Nabble Edit this page