svn commit: r1355450 [1/4] - in /ofbiz/branches/jackrabbit2012
Locked
svn commit: r1355450 [1/4] - in /ofbiz/branches/jackrabbit2012
 
|
Author: sascharodekamp
Date: Fri Jun 29 15:44:16 2012 New Revision: 1355450 URL: http://svn.apache.org/viewvc?rev=1355450&view=rev Log: Merge trunk into branch to keep the branch up to date Added: ofbiz/branches/jackrabbit20120501/specialpurpose/pos/config/XuiLabels_ar.properties - copied unchanged from r1355448, ofbiz/trunk/specialpurpose/pos/config/XuiLabels_ar.properties Removed: ofbiz/branches/jackrabbit20120501/applications/marketing/data/MarketingDemoData.xml ofbiz/branches/jackrabbit20120501/framework/testtools/OFBizSeleniumXmlIntro.pdf ofbiz/branches/jackrabbit20120501/framework/testtools/config/ ofbiz/branches/jackrabbit20120501/framework/testtools/convertSeleniumIDE.bat ofbiz/branches/jackrabbit20120501/framework/testtools/convertSeleniumIDE.sh ofbiz/branches/jackrabbit20120501/framework/testtools/data/ ofbiz/branches/jackrabbit20120501/framework/testtools/documents/ ofbiz/branches/jackrabbit20120501/framework/testtools/dtd/SeleniumXml.xsd ofbiz/branches/jackrabbit20120501/framework/testtools/entitydef/ ofbiz/branches/jackrabbit20120501/framework/testtools/lib/selenium-java-client-driver.jar ofbiz/branches/jackrabbit20120501/framework/testtools/runSeleniumServer.bat ofbiz/branches/jackrabbit20120501/framework/testtools/runSeleniumServer.sh ofbiz/branches/jackrabbit20120501/framework/testtools/runSeleniumXml.bat ofbiz/branches/jackrabbit20120501/framework/testtools/runSeleniumXml.sh ofbiz/branches/jackrabbit20120501/framework/testtools/script/ ofbiz/branches/jackrabbit20120501/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java ofbiz/branches/jackrabbit20120501/framework/testtools/src/org/ofbiz/testtools/selenium/ ofbiz/branches/jackrabbit20120501/framework/testtools/src/org/ofbiz/testtools/seleniumxml/ ofbiz/branches/jackrabbit20120501/framework/testtools/testdef/ ofbiz/branches/jackrabbit20120501/framework/testtools/webapp/ ofbiz/branches/jackrabbit20120501/framework/testtools/widget/ ofbiz/branches/jackrabbit20120501/specialpurpose/example/testdef/selenium/ Modified: ofbiz/branches/jackrabbit20120501/ (props changed) ofbiz/branches/jackrabbit20120501/.classpath ofbiz/branches/jackrabbit20120501/LICENSE ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityGroupDemoData.xml ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityPermissionSeedData.xml ofbiz/branches/jackrabbit20120501/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/applications/accounting/widget/GlScreens.xml ofbiz/branches/jackrabbit20120501/applications/content/data/WebtoolsHelpData.xml ofbiz/branches/jackrabbit20120501/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml ofbiz/branches/jackrabbit20120501/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/branches/jackrabbit20120501/applications/party/config/PartyUiLabels.xml ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/build.xml ofbiz/branches/jackrabbit20120501/framework/base/dtd/ofbiz-component.xsd ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/component/ComponentConfig.java ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/jackrabbit20120501/framework/bi/webapp/bi/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/framework/common/config/SecurityUiLabels.xml ofbiz/branches/jackrabbit20120501/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/fieldlookup.js ofbiz/branches/jackrabbit20120501/framework/images/webapp/images/selectall.js ofbiz/branches/jackrabbit20120501/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java ofbiz/branches/jackrabbit20120501/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/branches/jackrabbit20120501/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/branches/jackrabbit20120501/framework/service/entitydef/entitymodel.xml ofbiz/branches/jackrabbit20120501/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/jackrabbit20120501/framework/service/src/org/ofbiz/service/ServiceUtil.java ofbiz/branches/jackrabbit20120501/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java ofbiz/branches/jackrabbit20120501/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/branches/jackrabbit20120501/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java ofbiz/branches/jackrabbit20120501/framework/testtools/build.xml ofbiz/branches/jackrabbit20120501/framework/testtools/ofbiz-component.xml ofbiz/branches/jackrabbit20120501/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/jackrabbit20120501/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/jackrabbit20120501/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/branches/jackrabbit20120501/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml ofbiz/branches/jackrabbit20120501/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/framework/webtools/webapp/webtools/main.ftl ofbiz/branches/jackrabbit20120501/framework/webtools/widget/Menus.xml ofbiz/branches/jackrabbit20120501/framework/webtools/widget/ServiceForms.xml ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/jackrabbit20120501/specialpurpose/example/data/ExampleDemoData.xml ofbiz/branches/jackrabbit20120501/specialpurpose/pos/config/PosUiLabels.xml Propchange: ofbiz/branches/jackrabbit20120501/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1353078-1355448 Modified: ofbiz/branches/jackrabbit20120501/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/.classpath?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/.classpath (original) +++ ofbiz/branches/jackrabbit20120501/.classpath Fri Jun 29 15:44:16 2012 @@ -143,7 +143,6 @@ <classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/> <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/> <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/> - <classpathentry kind="lib" path="framework/testtools/lib/selenium-java-client-driver.jar"/> <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/> <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.web-3.1.0.M2.jar"/> <classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/> @@ -192,7 +191,6 @@ <classpathentry kind="src" path="framework/sql/src"/> <classpathentry kind="src" path="framework/sql/build/gen-src/javacc"/> <classpathentry kind="src" path="framework/start/src"/> - <classpathentry excluding="org/ofbiz/testtools/seleniumxml/**" kind="src" path="framework/testtools/src"/> <classpathentry excluding="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java|org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java|org/ofbiz/webapp/view/FopPdfViewHandler.java|org/ofbiz/webapp/view/GenericViewRenderer.java|org/ofbiz/webapp/view/JPublishViewHandler.java|org/ofbiz/webapp/view/JPublishWrapper.java|org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java|org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java|org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java|org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java" kind="src" path="framework/webapp/src"/> <classpathentry kind="src" path="framework/webtools/src"/> <classpathentry kind="src" path="framework/widget/src"/> Modified: ofbiz/branches/jackrabbit20120501/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/LICENSE?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/LICENSE (original) +++ ofbiz/branches/jackrabbit20120501/LICENSE Fri Jun 29 15:44:16 2012 @@ -105,7 +105,6 @@ ofbiz/trunk/framework/service/lib/axis2- ofbiz/trunk/framework/service/lib/commons-httpclient-3.1.jar ofbiz/trunk/framework/service/lib/neethi-2.0.4.jar ofbiz/trunk/framework/service/lib/XmlSchema-1.4.3.jar -ofbiz/trunk/framework/testtools/lib/selenium-java-client-driver.jar ofbiz/trunk/framework/webapp/lib/fop-1.0.jar ofbiz/trunk/framework/webapp/lib/velocity-1.6.1.jar ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.4.jar Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityGroupDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityGroupDemoData.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityGroupDemoData.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityGroupDemoData.xml Fri Jun 29 15:44:16 2012 @@ -26,7 +26,6 @@ under the License. <SecurityGroupPermission groupId="BIZADMIN" permissionId="PAYPROC_ADMIN"/> <!-- Payment Information security --> - <SecurityGroupPermission groupId="FULLADMIN" permissionId="PAY_INFO_ADMIN"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAY_INFO_CREATE"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAY_INFO_DELETE"/> <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAY_INFO_UPDATE"/> Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityPermissionSeedData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityPermissionSeedData.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityPermissionSeedData.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/accounting/data/AccountingSecurityPermissionSeedData.xml Fri Jun 29 15:44:16 2012 @@ -68,7 +68,6 @@ under the License. <!-- add admin to SUPER permission group --> <SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_ADMIN"/> - <SecurityGroupPermission groupId="SUPER" permissionId="PAY_INFO_ADMIN"/> <SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_COMM_VIEW"/> <SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_PRINT_CHECKS"/> <SecurityGroupPermission groupId="SUPER" permissionId="ACCTG_PREF_ADMIN"/> Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Fri Jun 29 15:44:16 2012 @@ -24,6 +24,7 @@ under the License. <if> <condition> <and> + <not><if-has-permission permission="ACCOUNTING" action="_ADMIN"/></not> <not><if-has-permission permission="PAY_INFO" action="_CREATE"/></not> <not><if-compare-field field="userLogin.partyId" to-field="parameters.partyIdFrom" operator="equals"/></not> <not><if-compare-field field="userLogin.partyId" to-field="parameters.partyIdTo" operator="equals"/></not> @@ -86,6 +87,7 @@ under the License. <if> <condition> <and> + <not><if-has-permission permission="ACCOUNTING" action="_ADMIN"/></not> <not><if-has-permission permission="PAY_INFO" action="_UPDATE"/></not> <not><if-compare-field field="userLogin.partyId" to-field="payment.partyIdFrom" operator="equals"/></not> <not><if-compare-field field="userLogin.partyId" to-field="payment.partyIdTo" operator="equals"/></not> Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Fri Jun 29 15:44:16 2012 @@ -89,7 +89,7 @@ public class PaymentMethodServices { // <b>security check</b>: userLogin partyId must equal paymentMethod partyId, or must have PAY_INFO_DELETE permission if (paymentMethod.get("partyId") == null || !paymentMethod.getString("partyId").equals(userLogin.getString("partyId"))) { - if (!security.hasEntityPermission("PAY_INFO", "_DELETE", userLogin)) { + if (!security.hasEntityPermission("PAY_INFO", "_DELETE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingPaymentMethodNoPermissionToDelete", locale)); } @@ -139,7 +139,7 @@ public class PaymentMethodServices { Timestamp now = UtilDateTime.nowTimestamp(); - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE"); + String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_ADMIN"); if (result.size() > 0) return result; @@ -260,7 +260,7 @@ public class PaymentMethodServices { Timestamp now = UtilDateTime.nowTimestamp(); - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE"); + String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_ADMIN"); if (result.size() > 0) return result; @@ -286,7 +286,7 @@ public class PaymentMethodServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingCreditCardUpdateWithPaymentMethodId", locale) + paymentMethodId); } - if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin)) { + if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingCreditCardUpdateWithoutPermission", UtilMisc.toMap("partyId", partyId, "paymentMethodId", paymentMethodId), locale)); @@ -488,7 +488,7 @@ public class PaymentMethodServices { Timestamp now = UtilDateTime.nowTimestamp(); - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE"); + String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_ADMIN"); if (result.size() > 0) return result; @@ -545,7 +545,7 @@ public class PaymentMethodServices { Timestamp now = UtilDateTime.nowTimestamp(); - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE"); + String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_ADMIN"); if (result.size() > 0) return result; @@ -574,7 +574,7 @@ public class PaymentMethodServices { "AccountingGiftCardCannotBeUpdated", UtilMisc.toMap("errorString", paymentMethodId), locale)); } - if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin)) { + if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingGiftCardPartyNotAuthorized", UtilMisc.toMap("partyId", partyId, "paymentMethodId", paymentMethodId), locale)); @@ -679,7 +679,7 @@ public class PaymentMethodServices { Timestamp now = UtilDateTime.nowTimestamp(); - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE"); + String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_CREATE", "ACCOUNTING", "_ADMIN"); if (result.size() > 0) return result; @@ -777,7 +777,7 @@ public class PaymentMethodServices { Timestamp now = UtilDateTime.nowTimestamp(); - String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE"); + String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PAY_INFO", "_UPDATE", "ACCOUNTING", "_ADMIN"); if (result.size() > 0) return result; @@ -806,7 +806,7 @@ public class PaymentMethodServices { "AccountingEftAccountCannotBeUpdated", UtilMisc.toMap("errorString", paymentMethodId), locale)); } - if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin)) { + if (!paymentMethod.getString("partyId").equals(partyId) && !security.hasEntityPermission("PAY_INFO", "_UPDATE", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingEftAccountCannotBeUpdated", UtilMisc.toMap("partyId", partyId, "paymentMethodId", paymentMethodId), locale)); Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jun 29 15:44:16 2012 @@ -42,12 +42,6 @@ under the License. <response name="success" type="request" value="main"/> </request-map> - <request-map uri="changeDelegator"> - <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="error"/> - </request-map> - <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/widget/GlScreens.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/accounting/widget/GlScreens.xml Fri Jun 29 15:44:16 2012 @@ -445,7 +445,12 @@ under the License. <decorator-screen name="CommonAdminChecksDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="checks-body"> <section> - <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition> + <condition> + <or> + <if-has-permission permission="ACCOUNTING" action="_ADMIN"/> + <if-has-permission permission="PAY_INFO" action="_UPDATE"/> + </or> + </condition> <widgets> <screenlet title="${uiLabelMap.AccountingSendChecks}"> <include-form name="ListChecksToSend" location="component://accounting/widget/PaymentForms.xml"/> Modified: ofbiz/branches/jackrabbit20120501/applications/content/data/WebtoolsHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/content/data/WebtoolsHelpData.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/content/data/WebtoolsHelpData.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/content/data/WebtoolsHelpData.xml Fri Jun 29 15:44:16 2012 @@ -30,14 +30,4 @@ objectInfo="framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List parties Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="WEBTOOLS_main" contentTypeId="DOCUMENT" contentName="Webtools main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="WEBTOOLS_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_WEBTOOLS" contentIdTo="WEBTOOLS_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="WEBTOOLS_main"/> - - <DataResource dataResourceId="WEBTOOLS_selenium" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="framework/testtools/data/helpdata/HELP_WEBTOOLS_selenium.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Selenium help" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="WEBTOOLS_selenium" contentTypeId="DOCUMENT" contentName="Selenium test." templateDataResourceId="HELP_TEMPL" dataResourceId="WEBTOOLS_selenium" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_WEBTOOLS" contentIdTo="WEBTOOLS_selenium" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="WEBTOOLS_selenium"/> - - <!--Selenium Help Load in contentTypeData.xml file --> - <DataResource dataResourceId="SELENIUM_HTTPS" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="framework/testtools/documents/OfbizSeleniumSetupHTTPS.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ofbiz Selenium HTTPS" mimeTypeId="text/xml" isPublic="Y" /> - <Content contentId="SELENIUM_HTTPS" contentTypeId="DOCUMENT" contentName="OFBiz Selenium with HTTPS" templateDataResourceId="HELP_TEMPL" dataResourceId="SELENIUM_HTTPS" localeString="en" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="DOCUMENTS" contentIdTo="SELENIUM_HTTPS" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum="" /> - </entity-engine-xml> +</entity-engine-xml> Modified: ofbiz/branches/jackrabbit20120501/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/content/webapp/content/WEB-INF/controller.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/content/webapp/content/WEB-INF/controller.xml Fri Jun 29 15:44:16 2012 @@ -52,13 +52,6 @@ under the License. <response name="success" type="view" value="fonts.fo"/> </request-map> - <request-map uri="changeDelegator"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="error"/> - </request-map> - <!-- ================ Blog Requests ================= --> <request-map uri="blogMain"> <security https="true" auth="true"/> Modified: ofbiz/branches/jackrabbit20120501/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri Jun 29 15:44:16 2012 @@ -46,12 +46,6 @@ under the License. <response name="success" type="request" value="main"/> </request-map> - <request-map uri="changeDelegator"> - <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="error"/> - </request-map> - <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> Modified: ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Jun 29 15:44:16 2012 @@ -46,12 +46,6 @@ under the License. <response name="success" type="request" value="main"/> </request-map> - <request-map uri="changeDelegator"> - <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="error"/> - </request-map> - <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> Modified: ofbiz/branches/jackrabbit20120501/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/marketing/config/MarketingUiLabels.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/marketing/config/MarketingUiLabels.xml Fri Jun 29 15:44:16 2012 @@ -800,6 +800,7 @@ <value xml:lang="zh_TW">æ¡è¿ä½¿ç¨è¡é·ç®¡çç¨å¼ï¼</value> </property> <property key="MarketingNoOfEmployees"> + <value xml:lang="de">Anzahl Angestellte</value> <value xml:lang="en">No of Employees</value> <value xml:lang="es">Nº Empleados</value> <value xml:lang="fr">N° des employés</value> Modified: ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/marketing/ofbiz-component.xml Fri Jun 29 15:44:16 2012 @@ -32,7 +32,6 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_opportunity.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> Modified: ofbiz/branches/jackrabbit20120501/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20120501/applications/marketing/webapp/marketing/WEB-INF/controller.xml Fri Jun 29 15:44:16 2012 @@ -45,13 +45,6 @@ under the License. <request-map uri="view"><security https="true" auth="false"/><response name="success" type="request" value="main"/></request-map> <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> - <request-map uri="changeDelegator"> - <security https="true" auth="true"/> - <event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="error"/> - </request-map> - <!-- =========== DataSource =========== --> <request-map uri="FindDataSource"><security https="true" auth="true"/><response name="success" type="view" value="FindDataSource"/></request-map> <request-map uri="EditDataSource"><security https="true" auth="true"/><response name="success" type="view" value="EditDataSource"/></request-map> Modified: ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1355450&r1=1355449&r2=1355450&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/jackrabbit20120501/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Fri Jun 29 15:44:16 2012 @@ -54,7 +54,7 @@ under the License. <#assign statusItem = payment.getRelatedOne("StatusItem", false)> <#assign partyName = delegator.findOne("PartyNameView", {"partyId" : payment.partyIdTo}, true)> <tr> - <#if security.hasPermission("PAY_INFO_VIEW", session) || security.hasPermission("PAY_INFO_ADMIN", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> <td><a href="/accounting/control/paymentOverview?paymentId=${payment.paymentId}">${payment.paymentId}</a></td> <#else> <td>${payment.paymentId}</td> @@ -342,7 +342,7 @@ under the License. <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> <br /> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> ${creditCard.cardType} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate} @@ -469,7 +469,7 @@ under the License. <td valign="top" width="60%"> <div> <#if giftCard?has_content> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> ${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}] [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>] <#else> @@ -596,7 +596,7 @@ under the License. <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId> <#assign creditCard = paymentMethodValueMap.creditCard/> <#if (creditCard?has_content)> - <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session)> + <#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> ${creditCard.cardType?if_exists} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate?if_exists} <#else> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |