svn commit: r1356181 [1/8] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1356181 [1/8] - in /ofbiz/branches/20120329_portl
 
|
Author: erwan
Date: Mon Jul 2 11:02:34 2012 New Revision: 1356181 URL: http://svn.apache.org/viewvc?rev=1356181&view=rev Log: keeping branch up-to-date, merging from 1351866 to 1355999 Added: ofbiz/branches/20120329_portletWidget/applications/accounting/data/AccountingSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/accounting/data/AccountingSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/CommonExtSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/commonext/data/CommonExtSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/commonext/data/CommonExtSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/commonext/data/OfbizSetupSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/content/data/ContentSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/content/data/ContentSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/content/data/ContentSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/content/data/ContentSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/humanres/data/HumanResSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/humanres/data/HumanResSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/marketing/data/MarketingSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/marketing/data/MarketingSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/marketing/data/MarketingSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/marketing/data/MarketingSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/order/data/OrderSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/order/data/OrderSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/order/data/OrderSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/order/data/OrderSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/party/data/PartySecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/party/data/PartySecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/party/data/PartySecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/party/data/PartySecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/product/data/FacilitySecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/product/data/FacilitySecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/product/data/FacilitySecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/product/data/FacilitySecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/product/data/ProductSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/product/data/ProductSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/product/data/ProductSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/product/data/ProductSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/applications/workeffort/data/WorkEffortSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/bi/data/BiSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/bi/data/BiSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/framework/bi/data/BiSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/bi/data/BiSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/common/data/CommonSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/common/data/CommonSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/framework/common/data/CommonSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/common/data/CommonSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/entityext/data/EntityExtSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/entityext/data/EntityExtSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/entityext/data/EntityExtSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/security/data/SecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/security/data/SecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/framework/security/data/SecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/security/data/SecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/service/data/ServiceSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/service/data/ServiceSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/framework/service/data/ServiceSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/service/data/ServiceSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/webtools/data/WebtoolsSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/framework/webtools/data/WebtoolsSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/service/JobDetails.groovy - copied unchanged from r1355999, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/JobDetails.groovy ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/assetmaint/data/AssetMaintSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/ebay/data/EbaySecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/example/data/ExampleSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/example/data/ExampleSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/googlebase/data/GoogleBaseSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/hhfacility/data/HhFacilitySecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/myportal/data/MyPortalSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/oagis/data/OagisSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/XuiLabels_ar.properties - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/pos/config/XuiLabels_ar.properties ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/data/ProjectMgrSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/projectmgr/data/ProjectMgrSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/scrum/data/scrumSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/webpos/data/WebPosSecurityPermissionSeedData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityGroupDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml - copied unchanged from r1355999, ofbiz/trunk/specialpurpose/workflow/data/WorkFlowSecurityPermissionSeedData.xml Removed: ofbiz/branches/20120329_portletWidget/applications/accounting/data/AccountingSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/CommonExtSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/commonext/data/OfbizSetupSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/content/data/ContentSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/content/data/ExampleHelpData.xml ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/data/ManufacturingSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/marketing/data/MarketingDemoData.xml ofbiz/branches/20120329_portletWidget/applications/marketing/data/MarketingSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/order/data/OrderSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/party/data/PartySecurityData.xml ofbiz/branches/20120329_portletWidget/applications/product/data/ProductSecurityData.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/data/WorkEffortSecurityData.xml ofbiz/branches/20120329_portletWidget/framework/base/config/jetty-containers.xml ofbiz/branches/20120329_portletWidget/framework/bi/data/BiSecurityData.xml ofbiz/branches/20120329_portletWidget/framework/common/data/CommonSecurityData.xml ofbiz/branches/20120329_portletWidget/framework/entityext/data/EntityExtSecurityData.xml ofbiz/branches/20120329_portletWidget/framework/security/data/SecurityData.xml ofbiz/branches/20120329_portletWidget/framework/security/data/SecurityDemoData.xml ofbiz/branches/20120329_portletWidget/framework/service/data/ServiceSecurityData.xml ofbiz/branches/20120329_portletWidget/framework/testtools/OFBizSeleniumXmlIntro.pdf ofbiz/branches/20120329_portletWidget/framework/testtools/config/ ofbiz/branches/20120329_portletWidget/framework/testtools/convertSeleniumIDE.bat ofbiz/branches/20120329_portletWidget/framework/testtools/convertSeleniumIDE.sh ofbiz/branches/20120329_portletWidget/framework/testtools/data/ ofbiz/branches/20120329_portletWidget/framework/testtools/documents/ ofbiz/branches/20120329_portletWidget/framework/testtools/dtd/SeleniumXml.xsd ofbiz/branches/20120329_portletWidget/framework/testtools/entitydef/ ofbiz/branches/20120329_portletWidget/framework/testtools/lib/selenium-java-client-driver.jar ofbiz/branches/20120329_portletWidget/framework/testtools/runSeleniumServer.bat ofbiz/branches/20120329_portletWidget/framework/testtools/runSeleniumServer.sh ofbiz/branches/20120329_portletWidget/framework/testtools/runSeleniumXml.bat ofbiz/branches/20120329_portletWidget/framework/testtools/runSeleniumXml.sh ofbiz/branches/20120329_portletWidget/framework/testtools/script/ ofbiz/branches/20120329_portletWidget/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java ofbiz/branches/20120329_portletWidget/framework/testtools/src/org/ofbiz/testtools/selenium/ ofbiz/branches/20120329_portletWidget/framework/testtools/src/org/ofbiz/testtools/seleniumxml/ ofbiz/branches/20120329_portletWidget/framework/testtools/testdef/ ofbiz/branches/20120329_portletWidget/framework/testtools/webapp/ ofbiz/branches/20120329_portletWidget/framework/testtools/widget/ ofbiz/branches/20120329_portletWidget/framework/webtools/data/WebtoolsSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/data/AssetMaintSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/data/EbaySecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/data/EbayStoreSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExampleSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/testdef/selenium/ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/data/GoogleBaseSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/data/GoogleCheckoutSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/data/HhFacilitySecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/data/MyPortalSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/data/OagisSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/data/ProjectMgrSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/data/scrumSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/data/WebPosSecurityData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/data/WorkFlowSecurityData.xml Modified: ofbiz/branches/20120329_portletWidget/ (props changed) ofbiz/branches/20120329_portletWidget/.classpath ofbiz/branches/20120329_portletWidget/LICENSE ofbiz/branches/20120329_portletWidget/applications/accounting/data/DemoPaymentsInvoices.xml ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/content/data/WebtoolsHelpData.xml ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResTypeData.xml ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/branches/20120329_portletWidget/applications/party/config/PartyUiLabels.xml ofbiz/branches/20120329_portletWidget/applications/party/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl ofbiz/branches/20120329_portletWidget/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/20120329_portletWidget/applications/product/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl ofbiz/branches/20120329_portletWidget/applications/workeffort/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/build.xml ofbiz/branches/20120329_portletWidget/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java ofbiz/branches/20120329_portletWidget/framework/base/config/both-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/install-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/limited-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/pos-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/rmi-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/config/testlist-containers.xml ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-component.xsd ofbiz/branches/20120329_portletWidget/framework/base/dtd/ofbiz-containers.xsd ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/component/ComponentConfig.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/BeanShellContainer.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ClassLoaderContainer.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ComponentContainer.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/Container.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerConfig.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/GroovyShellContainer.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/container/NamingServiceContainer.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/ScriptUtil.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/UtilHttp.java ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/bi/webapp/bi/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/framework/birt/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/birt/src/org/ofbiz/birt/container/BirtContainer.java ofbiz/branches/20120329_portletWidget/framework/catalina/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml ofbiz/branches/20120329_portletWidget/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/20120329_portletWidget/framework/geronimo/src/org/ofbiz/geronimo/GeronimoContainer.java ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/fieldlookup.js ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/selectall.js ofbiz/branches/20120329_portletWidget/framework/jetty/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/callops/CallScript.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/branches/20120329_portletWidget/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/branches/20120329_portletWidget/framework/resources/templates/AdminUserLoginData.xml ofbiz/branches/20120329_portletWidget/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/20120329_portletWidget/framework/security/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/service/entitydef/entitymodel.xml ofbiz/branches/20120329_portletWidget/framework/service/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/ServiceDispatcher.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/ServiceUtil.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java ofbiz/branches/20120329_portletWidget/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java ofbiz/branches/20120329_portletWidget/framework/start/src/org/ofbiz/base/start/jetty.properties ofbiz/branches/20120329_portletWidget/framework/testtools/build.xml ofbiz/branches/20120329_portletWidget/framework/testtools/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/testtools/src/org/ofbiz/testtools/TestListContainer.java ofbiz/branches/20120329_portletWidget/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/20120329_portletWidget/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java ofbiz/branches/20120329_portletWidget/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/20120329_portletWidget/framework/webtools/data/helpdata/HELP_WEBTOOLS.xml ofbiz/branches/20120329_portletWidget/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml ofbiz/branches/20120329_portletWidget/framework/webtools/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/framework/webtools/webapp/webtools/main.ftl ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CacheForms.xml ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CacheScreens.xml ofbiz/branches/20120329_portletWidget/framework/webtools/widget/Menus.xml ofbiz/branches/20120329_portletWidget/framework/webtools/widget/ServiceForms.xml ofbiz/branches/20120329_portletWidget/framework/webtools/widget/ServiceScreens.xml ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/form/FormFactory.java ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/20120329_portletWidget/specialpurpose/assetmaint/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebay/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExampleDemoData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/data/ExampleHelpData.xml ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/PosUiLabels.xml ofbiz/branches/20120329_portletWidget/specialpurpose/pos/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/testdef/scrumTests.xml ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat (props changed) ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh (props changed) Propchange: ofbiz/branches/20120329_portletWidget/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1351867-1355999 Modified: ofbiz/branches/20120329_portletWidget/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.classpath?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/.classpath (original) +++ ofbiz/branches/20120329_portletWidget/.classpath Mon Jul 2 11:02:34 2012 @@ -147,7 +147,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"/> @@ -196,7 +195,7 @@ <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 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/20120329_portletWidget/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/LICENSE?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/LICENSE (original) +++ ofbiz/branches/20120329_portletWidget/LICENSE Mon Jul 2 11:02:34 2012 @@ -93,7 +93,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/20120329_portletWidget/applications/accounting/data/DemoPaymentsInvoices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/data/DemoPaymentsInvoices.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/data/DemoPaymentsInvoices.xml Mon Jul 2 11:02:34 2012 @@ -22,6 +22,7 @@ under the License. <Person partyId="AcctBuyer" firstName="Acct" lastName="Buyer"/> <PartyRole partyId="AcctBuyer" roleTypeId="BUYER"/> <UserLogin partyId="AcctBuyer" userLoginId="AcctBuyer"/> + <SecurityGroup groupId="ORDERPURCH"/><!-- is needed because accounting is before order --> <UserLoginSecurityGroup userLoginId="AcctBuyer" groupId="ORDERPURCH" fromDate="2001-05-13 00:00:00"/> <Party partyId="AcctBigSupplier" partyTypeId="PARTY_GROUP"/> Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -39,7 +39,8 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/AccountingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/AccountingSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingPortletData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/PaymentGatewayConfData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/AccountingScheduledServiceData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Mon Jul 2 11:02:34 2012 @@ -2995,7 +2995,7 @@ public class PaymentGatewayServices { Security security = dctx.getSecurity(); // security check - if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin)) { + if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) { Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentTransactionNotAuthorized", locale)); @@ -3130,7 +3130,7 @@ public class PaymentGatewayServices { Delegator delegator = dctx.getDelegator(); Security security = dctx.getSecurity(); // security check - if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin)) { + if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_ADMIN", userLogin)) { Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentTransactionNotAuthorized", locale)); Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/webapp/accounting/payment/manualTx.ftl Mon Jul 2 11:02:34 2012 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.AccountingManualTransaction}</h1> <br /> -<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)> +<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session) || security.hasEntityPermission("ACCOUNTING", "_ADMIN", session)> ${setRequestAttribute("validTx", "false")} <form name="manualTxForm" method="post" action="<@ofbizUrl>manualETx</@ofbizUrl>"> <#if requestParameters.paymentMethodId?exists> Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/AccountingMenus.xml Mon Jul 2 11:02:34 2012 @@ -27,13 +27,19 @@ under the License. <menu-item name="PaymentGroup" title="${uiLabelMap.AccountingPaymentGroup}"><link target="FindPaymentGroup"/></menu-item> <menu-item name="transaction" title="${uiLabelMap.AccountingTransactions}"> <condition> + <or> <if-has-permission permission="MANUAL" action="_PAYMENT"/> + <if-has-permission permission="ACCOUNTING" action="_ADMIN"/> + </or> </condition> <link target="FindGatewayResponses"/> </menu-item> <menu-item name="PaymentGatewayConfig" title="${uiLabelMap.AccountingPaymentGatewayConfig}"> <condition> - <if-has-permission permission="PAYPROC" action="_ADMIN"/> + <or> + <if-has-permission permission="PAYPROC" action="_ADMIN"/> + <if-has-permission permission="ACCOUNTING" action="_ADMIN"/> + </or> </condition> <link target="FindPaymentGatewayConfig"/> </menu-item> Modified: ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/accounting/widget/GlScreens.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/commonext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/commonext/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -26,11 +26,13 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/CommonExtSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonExtSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/OfbizSetupSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/OfbizSetupSecurityGroupDemoData.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/data/WebtoolsHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/data/WebtoolsHelpData.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/data/WebtoolsHelpData.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/data/WebtoolsHelpData.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -36,7 +36,8 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/ContentSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/ContentSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/controller.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/humanres/data/HumanResTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResTypeData.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/humanres/data/HumanResTypeData.xml Mon Jul 2 11:02:34 2012 @@ -123,26 +123,6 @@ under the License. <EmplPositionType emplPositionTypeId="BIZ_ANALYST" hasTable="N" description="Business Analyst"/> <EmplPositionType emplPositionTypeId="_NA_"/> - <!-- OFBiz Recruitment security --> - <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component."/> - <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/> - <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/> - - <!-- Recruitment permission --> - <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/> - - <SecurityGroupPermission groupId="HUMANRES_ADMIN" permissionId="HUMANRES_ADMIN"/> - <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/> - <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/> - <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/> - <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="OFBTOOLS_VIEW"/> - <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_UPDATE"/> - <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_APPROVE"/> - <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_VIEW"/> - <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_CREATE"/> - <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="PARTYMGR_VIEW"/> - <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="OFBTOOLS_VIEW"/> - <JobInterviewType jobInterviewTypeId="JOB_INTERVW" description="It is a process in which an employee is evaluated by an employer for prospective employment in their company"/> <JobInterviewType jobInterviewTypeId="EXIT_INTERVW" description="It is conducted by an employer of a departing employee"/> <JobInterviewType jobInterviewTypeId="INFORMAL_INTERVW" description="It is a meeting in which a job seeker asks for advice rather than employment"/> Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/humanres/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -28,7 +28,8 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResHelpData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/HumanResSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/HumanResPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/HumanResDemoData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/humanres/webapp/humanres/WEB-INF/controller.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -34,7 +34,8 @@ under the License. <!-- entity resources: model(s), eca(s) and group definitions --> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/ManufacturingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/ManufacturingSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_EN.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ManufacturingHelpData_NL.xml"/> <!--<entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ManufacturingScheduledServices.xml"/>--> Modified: ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/marketing/config/MarketingUiLabels.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/marketing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/marketing/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -27,11 +27,11 @@ under the License. <classpath type="dir" location="config"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingTypeData.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/MarketingSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingSecurityGroupDemoData.xml"/> <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/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/marketing/webapp/marketing/WEB-INF/controller.xml Mon Jul 2 11:02:34 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/20120329_portletWidget/applications/order/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/order/ofbiz-component.xml Mon Jul 2 11:02:34 2012 @@ -34,7 +34,8 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/OrderScheduledServices.xml"/> - <entity-resource type="data" reader-name="security" loader="main" location="data/OrderSecurityData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderSecurityPermissionSeedData.xml"/> + <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderSecurityGroupDemoData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OrderHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoUser.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderDemoData.xml"/> Propchange: ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ Merged /ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:r1351867-1355999 Modified: ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1356181&r1=1356180&r2=1356181&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Mon Jul 2 11:02:34 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 |