svn commit: r1036344 [1/2] - in /ofbiz/branches/jquery: ./ applications/accounting/ applications/accounting/data/ applications/commonext/script/
Locked
svn commit: r1036344 [1/2] - in /ofbiz/branches/jquery: ./ applications/accounting/ applications/accounting/data/ applications/commonext/script/
 
|
Author: jleroux
Date: Thu Nov 18 08:32:31 2010 New Revision: 1036344 URL: http://svn.apache.org/viewvc?rev=1036344&view=rev Log: Merges the trunk at r1036332 Added: ofbiz/branches/jquery/applications/accounting/data/PaymentGatewayConfData.xml - copied unchanged from r1036339, ofbiz/trunk/applications/accounting/data/PaymentGatewayConfData.xml ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/error/ - copied from r1036339, ofbiz/trunk/applications/commonext/webapp/ofbizsetup/error/ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/error/error.jsp - copied unchanged from r1036339, ofbiz/trunk/applications/commonext/webapp/ofbizsetup/error/error.jsp ofbiz/branches/jquery/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml - copied unchanged from r1036339, ofbiz/trunk/applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml ofbiz/branches/jquery/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml - copied unchanged from r1036339, ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml ofbiz/branches/jquery/applications/content/widget/forum/BlogForms.xml ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml ofbiz/branches/jquery/applications/humanres/widget/CommonScreens.xml ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml ofbiz/branches/jquery/applications/marketing/data/MarketingHelpData.xml ofbiz/branches/jquery/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/branches/jquery/applications/marketing/widget/ContactListForms.xml ofbiz/branches/jquery/applications/marketing/widget/ContactListMenus.xml ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml ofbiz/branches/jquery/applications/party/data/PartyPortletData.xml ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/branches/jquery/applications/party/widget/partymgr/PartyMenus.xml ofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml ofbiz/branches/jquery/applications/party/widget/partymgr/VisitScreens.xml ofbiz/branches/jquery/applications/product/data/ProductTypeData.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductEvents.java ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductFeatures.ftl ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl ofbiz/branches/jquery/specialpurpose/ecommerce/widget/ForumForms.xml ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/branches/jquery/specialpurpose/ecommerce/widget/blog/BlogScreens.xml ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 18 08:32:31 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1034179 +/ofbiz/trunk:951708-1036339 Modified: ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml Thu Nov 18 08:32:31 2010 @@ -706,45 +706,7 @@ under the License. <!-- Payment Group Type --> <PaymentGroupType paymentGroupTypeId="CHECK_RUN" parentTypeId="" hasTable="N" description="Check Run"/> <PaymentGroupType paymentGroupTypeId="BATCH_PAYMENT" parentTypeId="" hasTable="N" description="Batch of Payments"/> - - <!-- Payment Gateway Config --> - <PaymentGatewayConfigType paymentGatewayConfigTypeId="SAGEPAY" hasTable="N" description="SagePay Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="SAGEPAY_CONFIG" paymentGatewayConfigTypeId="SAGEPAY" description="SagePay Config"/> - <PaymentGatewaySagePay paymentGatewayConfigId="SAGEPAY_CONFIG" vendor="YOUR_VENDOR_NAME" productionHost="https://live.sagepay.com:443" testingHost="https://test.sagepay.com:443" sagePayMode="TEST" protocolVersion="2.22" authenticationTransType="DEFERRED" authenticationUrl="/gateway/service/vspdirect-register.vsp" authoriseTransType="RELEASE" authoriseUrl="/gateway/service/release.vsp" releaseTransType="ABORT" releaseUrl="/gateway/service/abort.vsp" voidUrl="/gateway/service/void.vsp" refundUrl="/gateway/service/refund.vsp"/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="AUTHORIZE_NET" hasTable="N" description="Authorize Dot Net Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="AUTHORIZE_NET_CONFIG" paymentGatewayConfigTypeId="AUTHORIZE_NET" description="Authorize Dot Net Config"/> - <PaymentGatewayAuthorizeNet paymentGatewayConfigId="AUTHORIZE_NET_CONFIG" transactionUrl="https://certification.authorize.net/gateway/transact.dll" certificateAlias="certification.authorize.net-1" apiVersion="3.1" delimitedData="TRUE" delimiterChar="|" method="CC" emailCustomer="FALSE" emailMerchant="FALSE" testMode="TRUE" relayResponse="FALSE" tranKey="" userId="" pwd="" transDescription="OFBizAuthNet"/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="CYBERSOURCE" hasTable="N" description="CyberSource Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="CYBERSOURCE_CONFIG" paymentGatewayConfigTypeId="CYBERSOURCE" description="CyberSource Config"/> - <PaymentGatewayCyberSource paymentGatewayConfigId="CYBERSOURCE_CONFIG" merchantId="[MerchantID]" apiVersion="1.43" production="false" keysDir="${sys:getProperty('ofbiz.home')}/applications/accounting/icskeys" keysFile="merchantID.p12" logEnabled="true" logDir="${sys:getProperty('ofbiz.home')}/runtime/logs" logFile="cybersource.log" logSize="10" merchantDescr="Some Nice Web Store" merchantContact="" autoBill="false" enableDav="N" fraudScore="N" ignoreAvs="false" disableBillAvs="Y" avsDeclineCodes=""/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYFLOWPRO" hasTable="N" description="Payflow Pro Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="PAYFLOWPRO_CONFIG" paymentGatewayConfigTypeId="PAYFLOWPRO" description="Payflow Pro Config"/> - <PaymentGatewayPayflowPro paymentGatewayConfigId="PAYFLOWPRO_CONFIG" certsPath="${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts" hostAddress="pilot-payflowpro.paypal.com" hostPort="443" timeout="80" proxyAddress="" proxyPort="80" proxyLogon="" proxyPassword="" - vendor="[Vendor]" userId="[PayFlow UserID]" pwd="[PayFlow Password]" partner="[PayFlow Partner]" checkAvs="Y" checkCvv2="Y" preAuth="Y" enableTransmit="true" logFileName="${sys:getProperty('ofbiz.home')}/runtime/logs/payflow_java.log" loggingLevel="6" maxLogFileSize="1000000" stackTraceOn="N" returnUrl="[Express Checkout Return URL]" cancelReturnUrl="[Express Checkout Cancel Return URL]" redirectUrl="[Express Checkout Customer Redirect URL]"/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="PayPal Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/> - <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" apiUserName="" apiPassword="" apiSignature="" apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" shippingCallbackUrl="" requireConfirmedShipping="N"/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="CLEARCOMMERCE" hasTable="N" description="Clear Commerce Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" paymentGatewayConfigTypeId="CLEARCOMMERCE" description="Clear Commerce Config"/> - <PaymentGatewayClearCommerce paymentGatewayConfigId="CLEARCOMMERCE_CONFIG" sourceId="mySource" groupId="myGroup" clientId="[ClearCommerce clientId]" username="[ClearCommerce username]" pwd="[ClearCommerce password]" userAlias="[ClearCommerce alias]" effectiveAlias="" processMode="P" serverURL="https://test5x.clearcommerce.com:11500" enableCVM="N"/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="WORLDPAY" hasTable="N" description="RBS WorldPay Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG" paymentGatewayConfigTypeId="WORLDPAY" description="RBS WorldPay Config"/> - <PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG" redirectUrl="https://select-test.worldpay.com/wcc/purchase" instId="" authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId="" noLanguageMenu="N" withDelivery="N" testMode="100"/> - - <PaymentGatewayConfigType paymentGatewayConfigTypeId="ORBITAL" hasTable="N" description="Orbital Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="ORBITAL_CONFIG" paymentGatewayConfigTypeId="ORBITAL" description="Orbital Config"/> - <PaymentGatewayOrbital paymentGatewayConfigId="ORBITAL_CONFIG" username="ofbizuser" connectionPassword="ofbizpwd" merchantId="785240009879" engineClass="com.paymentech.orbital.sdk.engine.https.HttpsEngine" hostName="orbitalvar1.paymentech.net" port="443" hostNameFailover="orbitalvar2.paymentech.net" portFailover="443" connectionTimeoutSeconds="90" readTimeoutSeconds="90" authorizationURI="/authorize" sdkVersion="PaymentechSDK_6.3.0" sslSocketFactory="default" responseType="gateway"/> - <PaymentGatewayConfigType paymentGatewayConfigTypeId="SECUREPAY" hasTable="N" description="SecurePay Payment Gateway"/> - <PaymentGatewayConfig paymentGatewayConfigId="SECUREPAY_CONFIG" paymentGatewayConfigTypeId="SECUREPAY" description="SecurePay Config"/> - <PaymentGatewaySecurePay paymentGatewayConfigId="SECUREPAY_CONFIG" merchantId="[SecurePay MerchantID]" pwd="[SecurePay Password]" serverURL="[SecurePay serverURL]" processTimeout="80" enableAmountRound="N"/> - <!-- Credit Card methods by type --> <CustomMethodType customMethodTypeId="CC_AUTH" parentTypeId="" hasTable="N" description="Credit Card authorize methods"/> <CustomMethodType customMethodTypeId="CC_CAPTURE" parentTypeId="" hasTable="N" description="Credit Card capture methods"/> Modified: ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml (original) +++ ofbiz/branches/jquery/applications/accounting/ofbiz-component.xml Thu Nov 18 08:32:31 2010 @@ -41,6 +41,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.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"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGeneralChartOfAccounts.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrganizationData.xml"/> Modified: ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original) +++ ofbiz/branches/jquery/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Thu Nov 18 08:32:31 2010 @@ -338,18 +338,6 @@ <set field="organizationPartyId" from-field="parameters.partyId"/> <set field="personContext.partyId" from-field="parameters.customerPartyId"/> <call-simple-method method-name="createUser" xml-resource="component://party/script/org/ofbiz/party/user/UserEvents.xml"/> - - <!-- Create PartyRelationship --> - <set field="lookupValue.partyIdFrom" from-field="tempMap.partyId"/> - <set field="lookupValue.partyIdTo" from-field="organizationPartyId"/> - <set field="lookupValue.roleTypeIdFrom" value="CUSTOMER"/> - <set field="lookupValue.roleTypeIdTo" value="INTERNAL_ORGANIZATIO"/> - <set field="lookupValue.partyRelationshipTypeId" value="CUSTOMER_REL"/> - <session-to-field field="lookupValue.userLogin" session-name="userLogin"/> - <call-service service-name="createPartyRelationship" in-map-name="lookupValue"/> - - <field-to-request field="organizationPartyId" request-name="partyId"/> - <field-to-request field="tempMap.partyId" request-name="customerId"/> </simple-method> <simple-method method-name="createFacilityAndContactMech" short-description="create Facility and ContactMech"> Modified: ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml Thu Nov 18 08:32:31 2010 @@ -26,41 +26,25 @@ <request-map uri="main"> <security https="true" auth="true"/> - <response name="success" type="view" value="initialsetup"/> + <response name="success" type="view" value="initialsetup" save-home-view="true"/> </request-map> <request-map uri="initialsetup"> <security https="true" auth="true"/> - <response name="success" type="view" value="initialsetup"/> + <response name="success" type="view" value="initialsetup" save-home-view="true"/> </request-map> - <request-map uri="editpartygroup"> + <request-map uri="showMessage"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartyGroup"/> + <response name="success" type="view" value="showMessage"/> </request-map> + + <!-- party requests --> <request-map uri="updatePartyGroup"> <security https="true" auth="true"/> <event type="service" path="" invoke="updatePartyGroup"/> - <response name="success" type="request" value="viewprofile"/> + <response name="success" type="request" value="initialsetup"/> <response name="error" type="view" value="EditPartyGroup"/> </request-map> - <request-map uri="editperson"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditPerson"/> - </request-map> - <request-map uri="updatePerson"> - <security https="true" auth="true"/> - <event type="service" path="" invoke="updatePerson"/> - <response name="success" type="view-last"/> - <response name="error" type="view" value="EditPerson"/> - </request-map> - <request-map uri="viewprofile"> - <security https="true" auth="true"/> - <response name="success" type="view" value="viewprofile" save-home-view="true"/> - </request-map> - <request-map uri="showMessage"> - <security https="true" auth="true"/> - <response name="success" type="view" value="showMessage"/> - </request-map> <!-- Entity Export requests --> <request-map uri="EntityExportAll"> @@ -100,14 +84,14 @@ <request-map uri="createOrganization"> <security https="true" auth="true"/> <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="createOrganization"/> - <response name="success" type="view" value="viewprofile"/> + <response name="success" type="view" value="initialsetup"/> <response name="error" type="view" value="initialsetup"/> </request-map> <request-map uri="OrganizationToComplete"> <security https="true" auth="true"/> <event type="simple" path="component://commonext/script/org/ofbiz/setup/SetupEvents.xml" invoke="setupDefaultGeneralLedger"/> - <response name="success" type="view" value="initialsetup"/> + <response name="success" type="url" value="/catalog"/> <response name="error" type="view" value="initialsetup"/> </request-map> @@ -214,9 +198,6 @@ <!-- View Mappings --> <view-map name="initialsetup" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#InitialSetup"/> <view-map name="showMessage" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#nopartyAcctgPreference"/> - <view-map name="viewprofile" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#viewprofile"/> - <view-map name="EditPerson" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#EditPerson"/> - <view-map name="EditPartyGroup" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#EditPartyGroup"/> <view-map name="ViewFacility" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#ViewFacility"/> <view-map name="EditFacility" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#EditFacility"/> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/CommonScreens.xml Thu Nov 18 08:32:31 2010 @@ -51,11 +51,21 @@ </section> </screen> + <screen name="CommonPartyDecorator"> + <section> + <widgets> + <include-screen name="CommonSetupDecorator"/> + </widgets> + </section> + </screen> + <screen name="CommonSetupDecorator"> <section> <actions> - <set field="headerItem" value="init"/> - <set field="partyId" from-field="parameters.partyId"/> + <entity-condition entity-name="PartyRole" list="parties"> + <condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/> + </entity-condition> + <set field="partyId" from-field="parties[0].partyId"/> <entity-one entity-name="Party" value-field="party"/> <entity-one entity-name="PartyGroup" value-field="lookupGroup"/> </actions> @@ -66,13 +76,26 @@ <condition> <and> <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/> - <not><if-empty field="party"/></not> + <if-compare operator="not-equals" value="init" field="headerItem"/> </and> </condition> <widgets> <include-menu location="component://commonext/widget/ofbizsetup/Menus.xml" name="SetupSubTabBar"/> </widgets> </section> + <section> + <condition> + <not><if-empty field="partyId"/></not> + </condition> + <widgets> + <container style="button-bar"> + <link target="OrganizationToComplete" text="${uiLabelMap.SetupSetToComplete}" style="buttontext"> + <parameter param-name="partyId" from-field="organizationPartyId"/> + <parameter param-name="roleTypeId" value="ORGANIZATION_ROLE"/> + </link> + </container> + </widgets> + </section> </decorator-section> <decorator-section name="body"> <section> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/Menus.xml Thu Nov 18 08:32:31 2010 @@ -21,7 +21,7 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="SetupAppBar" title="${uiLabelMap.SetupApp}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="init" title="${uiLabelMap.SetupInitialSetup}"> + <menu-item name="main" title="${uiLabelMap.SetupInitialSetup}"> <link target="initialsetup"/> </menu-item> <menu-item name="export" title="${uiLabelMap.PageTitleEntityExportAll}"> @@ -32,31 +32,45 @@ <menu name="SetupSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItemTop"> <menu-item name="organization" title="${uiLabelMap.SetupOrganization}"> - <link target="viewprofile"> - <parameter param-name="partyId"/> - </link> + <condition> + <not><if-empty field="partyId"/></not> + </condition> + <link target="initialsetup"/> </menu-item> <menu-item name="facility" title="${uiLabelMap.SetupFacility}"> + <condition> + <not><if-empty field="partyId"/></not> + </condition> <link target="EditFacility"> <parameter param-name="partyId"/> </link> </menu-item> <menu-item name="productstore" title="${uiLabelMap.SetupProductStore}"> + <condition> + <not><if-empty field="partyId"/></not> + </condition> <link target="EditProductStore"> <parameter param-name="partyId"/> </link> </menu-item> <menu-item name="website" title="${uiLabelMap.SetupWebSite}"> + <condition> + <not><if-empty field="partyId"/></not> + </condition> <link target="EditWebSite"> <parameter param-name="partyId"/> </link> </menu-item> <menu-item name="firstcustomer" title="${uiLabelMap.SetupFirstCustomer}"> - <link target="firstcustomer"> - <parameter param-name="partyId"/> - </link> + <condition> + <not><if-empty field="partyId"/></not> + </condition> + <link target="firstcustomer"/> </menu-item> <menu-item name="firstproduct" title="${uiLabelMap.SetupFirstProduct}"> + <condition> + <not><if-empty field="partyId"/></not> + </condition> <link target="firstproduct"> <parameter param-name="partyId"/> </link> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/ProfileScreens.xml Thu Nov 18 08:32:31 2010 @@ -27,21 +27,13 @@ <actions> <set field="titleProperty" value="PartyCreateNewCustomer"/> <set field="tabButtonItemTop" value="firstcustomer"/> - <set field="target" value="createCustomer"/> - <set field="partyId" from-field="parameters.partyId"/> - <entity-condition entity-name="PartyRelationship" list="customerRels" filter-by-date="true"> - <condition-list> - <condition-expr field-name="partyIdTo" from-field="partyId"/> - <condition-expr field-name="roleTypeIdFrom" value="CUSTOMER"/> - <condition-expr field-name="roleTypeIdTo" value="INTERNAL_ORGANIZATIO"/> - <condition-expr field-name="partyRelationshipTypeId" value="CUSTOMER_REL"/> - </condition-list> + <set field="partyId" value="CUST"/> + <entity-condition entity-name="PartyRole" list="parties"> + <condition-expr field-name="roleTypeId" operator="equals" value="CUSTOMER"/> </entity-condition> - <set field="customerRel" from-field="customerRels[0]"/> - + <set field="partyId" from-field="parties[0].partyId"/> <set field="customerPartyId" from-field="customerRel.partyIdFrom"/> - <set field="organizationPartyId" from-field="parameters.partyId"/> <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/> <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/> </actions> @@ -55,16 +47,28 @@ <widgets> <section> <condition> - <not><if-empty field="customerRel"/></not> + <if-empty field="parties"/> </condition> + <actions> + <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? --> + <set field="dependentForm" value="NewCustomer"/> + <set field="paramKey" value="countryGeoId"/> + <set field="mainId" value="USER_COUNTRY"/> + <set field="dependentId" value="USER_STATE"/> + <set field="requestName" value="getAssociatedStateList"/> + <set field="responseName" value="stateList"/> + <set field="dependentKeyName" value="geoId"/> + <set field="descName" value="geoName"/> + <set field="selectedDependentOption" value="_none_"/> + </actions> <widgets> - <include-screen name="Party"/> - <include-screen name="Contact"/> - </widgets> - <fail-widgets> + <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.PartyCreateNewCustomer}"> <include-form name="NewCustomer" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> </screenlet> + </widgets> + <fail-widgets> + <include-screen name="viewprofile"/> </fail-widgets> </section> </widgets> @@ -80,223 +84,14 @@ <screen name="viewprofile"> <section> - <actions> - <set field="tabButtonItemTop" value="organization"/> - <set field="organizationPartyId" from-field="parameters.partyId"/> - <entity-condition entity-name="PartyRole" list="partyRoles"> - <condition-list combine="and"> - <condition-expr field-name="partyId" operator="equals" from-field="organizationPartyId"/> - <condition-expr field-name="roleTypeId" operator="equals" value="ORGANIZATION_ROLE"/> - </condition-list> - </entity-condition> - <set field="partyRole" from-field="partyRoles[0]"/> - </actions> + <actions> + <set field="parameters.partyId" from-field="partyId"/> + </actions> <widgets> - <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-empty field="partyRole"/> - </condition> - <widgets> - <container style="button-bar"> - <link target="OrganizationToComplete" text="${uiLabelMap.SetupSetToComplete}" style="buttontext"> - <parameter param-name="partyId" from-field="organizationPartyId"/> - <parameter param-name="roleTypeId" value="ORGANIZATION_ROLE"/> - </link> - </container> - </widgets> - </section> - <include-screen name="Party"/> - <include-screen name="Contact"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="Party"> - <section> - <actions> - <entity-condition entity-name="PartyRelationship" list="customerRels" filter-by-date="true"> - <condition-list> - <condition-expr field-name="partyIdTo" from-field="parameters.partyId"/> - <condition-expr field-name="roleTypeIdFrom" value="CUSTOMER"/> - <condition-expr field-name="roleTypeIdTo" value="INTERNAL_ORGANIZATIO"/> - <condition-expr field-name="partyRelationshipTypeId" value="CUSTOMER_REL"/> - </condition-list> - </entity-condition> - <set field="customerRel" from-field="customerRels[0]"/> - - <set field="partyId" from-field="customerPartyId" default-value="${organizationPartyId}"/> - <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList"> - <field-map field-name="partyId" from-field="partyId"/> - <order-by field-name="-changeDate"/> - </entity-and> - <entity-one entity-name="PartyAndGroup" value-field="lookupGroup"> - <field-map field-name="partyId" from-field="parameters.partyId"/> - </entity-one> - <entity-one entity-name="PartyAndPerson" value-field="lookupPerson"> - <field-map field-name="partyId" from-field="customerPartyId"/> - </entity-one> - </actions> - <widgets> - <section> - <condition> - <and> - <if-compare field="tabButtonItemTop" operator="equals" value="firstcustomer"/> - <not><if-empty field="lookupPerson"/></not> - </and> - </condition> - <widgets> - <container> - <label style="h1" text="${uiLabelMap.SetupTheFirstCustomerOf} ${lookupGroup.groupName}"/> - </container> - <container style="clear"/> - <section> - <condition> - <or> - <if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/> - <if-compare-field field="customerPartyId" operator="equals" to-field="userLogin.partyId"/> - </or> - </condition> - <widgets> - <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel"> - <include-menu name="personUpdate" location="component://commonext/widget/ofbizsetup/Menus.xml"/> - <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/> - <section> - <condition> - <not><if-empty field="partyNameHistoryList"/></not> - </condition> - <widgets> - <include-form name="ViewPartyPersonHistory" location="component://party/widget/partymgr/PartyForms.xml"/> - </widgets> - </section> - </screenlet> - </widgets> - <fail-widgets> - <screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel"> - <include-form name="ViewPartyPerson" location="component://party/widget/partymgr/PartyForms.xml"/> - <section> - <condition> - <not><if-empty field="partyNameHistoryList"/></not> - </condition> - <widgets> - <include-form name="ViewPartyPersonHistory" location="component://party/widget/partymgr/PartyForms.xml"/> - </widgets> - </section> - </screenlet> - </fail-widgets> - </section> - </widgets> - </section> - <section> - <condition> - <and> - <if-compare field="tabButtonItemTop" operator="equals" value="organization"/> - <not><if-empty field="lookupGroup"/></not> - </and> - </condition> - <widgets> - <section> - <condition> - <if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.SetupOrganizationInformation}" navigation-menu-name="groupUpdate" id="PartyGroupInformationPanel"> - <include-menu name="groupUpdate" location="component://commonext/widget/ofbizsetup/Menus.xml"/> - <include-form name="ViewOrganization" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> - <section> - <condition> - <not><if-empty field="partyNameHistoryList"/></not> - </condition> - <widgets> - <include-form name="ViewPartyGroupHistory" location="component://party/widget/partymgr/PartyForms.xml"/> - </widgets> - </section> - </screenlet> - </widgets> - <fail-widgets> - <screenlet title="${uiLabelMap.SetupOrganizationInformation}" navigation-menu-name="groupUpdate" id="PartyGroupInformationPanel"> - <include-form name="ViewOrganization" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> - <section> - <condition> - <not><if-empty field="partyNameHistoryList"/></not> - </condition> - <widgets> - <include-form name="ViewPartyGroupHistory" location="component://party/widget/partymgr/PartyForms.xml"/> - </widgets> - </section> - </screenlet> - </fail-widgets> - </section> - </widgets> - </section> - </widgets> - </section> - </screen> - - <screen name="Contact"> - <section> - <actions> - <set field="partyId" from-field="customerPartyId" default-value="${parameters.partyId}"/> - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy"/> - <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/> - </actions> - <widgets> - <platform-specific> - <html> - <html-template location="component://party/webapp/partymgr/party/profileblocks/Contact.ftl"/> - </html> - </platform-specific> - </widgets> - </section> - </screen> - - <screen name="EditPartyGroup"> - <section> - <actions> - <set field="titleProperty" value="SetupEditOrganizationInformation"/> - <set field="tabButtonItemTop" value="organization"/> - <set field="labelTitleProperty" value="SetupEditOrganizationInformation"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/> - <set field="partyId" from-field="parameters.partyId"/> - <entity-one entity-name="PartyAndGroup" value-field="partyGroup"/> - </actions> - <widgets> - <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.SetupEditOrganizationInformation}"> - <include-form name="EditPartyGroup" location="component://party/widget/partymgr/PartyForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - - <screen name="EditPerson"> - <section> - <actions> - <set field="titleProperty" value="PageTitleEditPersonalInformation"/> - <set field="tabButtonItemTop" value="firstcustomer"/> - <set field="labelTitleProperty" value="PageTitleEditPersonalInformation"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="firstcustomer"/> - <set field="partyId" from-field="parameters.customerPartyId"/> - <entity-one entity-name="PartyAndPerson" value-field="personInfo"/> - <set field="parameters.partyId" from-field="parameters.organizationPartyId"/> - </actions> - <widgets> - <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEditPersonalInformation}"> - <include-form name="EditCustomer" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> + <include-screen name="Party" location="applications/party/widget/partymgr/ProfileScreens.xml"/> + <include-screen name="Contact" location="applications/party/widget/partymgr/ProfileScreens.xml"/> </widgets> </section> </screen> </screens> + Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupForms.xml Thu Nov 18 08:32:31 2010 @@ -24,24 +24,17 @@ <form name="NewOrganization" type="single" target="${target}${previousParams}" focus-field-name="USER_TITLE" header-row-style="header-row" default-table-style="basic-table"> <field name="USE_ADDRESS"><hidden value="${USE_ADDRESS}"/></field> + <field name="require_email"><hidden value="${require_email}"/></field> <field name="partyId"><text/></field> <field name="groupName" title="${uiLabelMap.SetupOrganizationName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> - <field name="ShippingAddressTitle" title="${uiLabelMap.PartyAddressMailingShipping}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="USER_ADDRESS1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> <field name="USER_ADDRESS2" title="${uiLabelMap.CommonAddress2}"><text size="30" maxlength="60"/></field> <field name="USER_CITY" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> - <field name="USER_STATE" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> - <drop-down allow-empty="true"> - <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}"> - <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/> - <entity-order-by field-name="geoId"/> - </entity-options> - </drop-down> - </field> + <field name="USER_STATE" title="${uiLabelMap.CommonState}" widget-style="required"><drop-down allow-empty="false"/></field> <field name="USER_POSTAL_CODE" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field> <field name="USER_COUNTRY" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> - <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}"> + <drop-down no-current-selected-key="${defaultCountryGeoId}"> <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}"> <entity-constraint name="geoTypeId" value="COUNTRY"/> <entity-order-by field-name="geoId"/> Modified: ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original) +++ ofbiz/branches/jquery/applications/commonext/widget/ofbizsetup/SetupScreens.xml Thu Nov 18 08:32:31 2010 @@ -24,35 +24,52 @@ <screen name="InitialSetup"> <section> <actions> + <set field="tabButtonItemTop" value="organization"/> <set field="titleProperty" value="SetupCreateNewOrganization"/> <set field="target" value="createOrganization"/> <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/> + <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/> <entity-condition entity-name="PartyRole" list="parties"> <condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/> </entity-condition> - <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/> + <set field="partyId" from-field="parties[0].partyId"/> + <set field="parameters.partyId" from-field="parties[0].partyId"/> </actions> <widgets> - <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="PARTYMGR" action="_CREATE"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}"> - <include-form name="ListOrganizations" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> - </screenlet> + <decorator-screen name="CommonSetupDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <if-empty field="parties"/> + </condition> + <widgets> + <section> + <actions> + <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? --> + <set field="dependentForm" value="NewOrganization"/> + <set field="paramKey" value="countryGeoId"/> + <set field="mainId" value="USER_COUNTRY"/> + <set field="dependentId" value="USER_STATE"/> + <set field="requestName" value="getAssociatedStateList"/> + <set field="responseName" value="stateList"/> + <set field="dependentKeyName" value="geoId"/> + <set field="descName" value="geoName"/> + <set field="selectedDependentOption" value="_none_"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> <screenlet title="${uiLabelMap.SetupCreateNewOrganization}"> <include-form name="NewOrganization" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/> </screenlet> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> + </widgets> + </section> + </widgets> + <fail-widgets> + <include-screen name="viewprofile" location="component://commonext/widget/ofbizsetup/ProfileScreens.xml"/> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> </widgets> </section> </screen> Modified: ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml Thu Nov 18 08:32:31 2010 @@ -78,6 +78,10 @@ <value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value> <value xml:lang="zh">å ³è</value> </property> + <property key="ContentArticleName"> + <value xml:lang="en">Article Name</value> + <value xml:lang="th">à¸à¸·à¹à¸à¸à¸à¸à¸§à¸²à¸¡</value> + </property> <property key="ContentAttribute"> <value xml:lang="ar">خاصÙØ©</value> <value xml:lang="da">Attribut</value> @@ -112,7 +116,8 @@ <value xml:lang="en">Article</value> <value xml:lang="fr">Article</value> <value xml:lang="it">Articolo</value> - <value xml:lang="nl">Artikel</value> + <value xml:lang="nl">Artikel</value> + <value xml:lang="pt_BR">Artigo</value> <value xml:lang="zh">æç« </value> </property> <property key="ContentBlogArticleList"> @@ -131,6 +136,15 @@ <value xml:lang="nl">Beschrijving blog</value> <value xml:lang="zh">å客æè¿°</value> </property> + <property key="ContentBlogEntryId"> + <value xml:lang="da">Blog indlæg id</value> + <value xml:lang="en">Blog entry Id</value> + <value xml:lang="fr">Réf. de note de blog</value> + <value xml:lang="it">Voce blog</value> + <value xml:lang="nl">Blog ingave ID</value> + <value xml:lang="pt_BR">ID de entrada de blog</value> + <value xml:lang="zh">å客记å½æ è¯</value> + </property> <property key="ContentBlogEdit"> <value xml:lang="da">Redigér en blog</value> <value xml:lang="en">Edit a Blog</value> @@ -1435,6 +1449,22 @@ <value xml:lang="th">Sites ยà¹à¸à¸¢</value> <value xml:lang="zh">åç«ç¹</value> </property> + <property key="ContentSummary"> + <value xml:lang="da">Resumé</value> + <value xml:lang="de">Zusammenfassung</value> + <value xml:lang="en">Summary</value> + <value xml:lang="es">Resumen</value> + <value xml:lang="fr">Résumé</value> + <value xml:lang="hi_IN">साराशà¤</value> + <value xml:lang="it">Sommario</value> + <value xml:lang="ja">Summary</value> + <value xml:lang="nl">Samenvatting</value> + <value xml:lang="pt_BR">Resumo</value> + <value xml:lang="ro">Breviar</value> + <value xml:lang="ru">ÐÑоги</value> + <value xml:lang="th">สรุà¸</value> + <value xml:lang="zh">æè¦</value> + </property> <property key="ContentSurveryCategory"> <value xml:lang="ar">Ùئة</value> <value xml:lang="da">Kategori</value> Modified: ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/branches/jquery/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Thu Nov 18 08:32:31 2010 @@ -129,6 +129,7 @@ <or> <if-compare-field field="parameters.contentName" operator="not-equals" to-field="contentName"/> <if-compare-field field="parameters.description" operator="not-equals" to-field="description"/> + <if-compare-field field="parameters.summaryData" operator="not-equals" to-field="summaryData"/> <if-compare-field field="parameters.templateDataResourceId" operator="not-equals" to-field="templateDataResourceId"/> <if-compare-field field="parameters.statusId" operator="not-equals" to-field="statusId"/> </or> @@ -174,8 +175,31 @@ </if-compare-field> </if-not-empty> + <!-- create summary text --> + <if-empty field="summaryData"> + <if-not-empty field="parameters.summaryData"> + <!-- create the summary data --> + <set field="ownerContentId" from-field="parameters.blogContentId"/> + <set field="contentAssocTypeId" value="SUB_CONTENT"/> + <set field="contentIdFrom" from-field="contentId"/> + <set field="createSummary.dataResourceTypeId" value="ELECTRONIC_TEXT"/> + <set field="createSummary.contentPurposeTypeId" value="ARTICLE"/> + <set field="createSummary.dataTemplateTypeId" value="NONE"/> + <set field="createSummary.mapKey" value="SUMMARY"/> + <set field="createSummary.ownerContentId" from-field="ownerContentId"/> + <set field="createSummary.contentName" from-field="parameters.contentName"/> + <set field="createSummary.description" from-field="parameters.description"/> + <set field="createSummary.statusId" from-field="parameters.statusId"/> + <set field="createSummary.contentAssocTypeId" from-field="contentAssocTypeId"/> + <set field="createSummary.textData" from-field="parameters.summaryData"/> + <set field="createSummary.contentIdFrom" from-field="contentIdFrom"/> + <set field="createSummary.partyId" from-field="userLogin.partyId"/> + <call-service service-name="createTextContent" in-map-name="createSummary"/> + </if-not-empty> + </if-empty> + <!-- update summary text --> - <if-not-empty field="summaryText"> + <if-not-empty field="summaryData"> <if-compare-field field="parameters.summaryData" operator="not-equals" to-field="summaryData"> <set field="summaryText.textData" from-field="parameters.summaryData"/> <store-value value-field="summaryText"/> Modified: ofbiz/branches/jquery/applications/content/widget/forum/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/forum/BlogForms.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/forum/BlogForms.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/forum/BlogForms.xml Thu Nov 18 08:32:31 2010 @@ -63,5 +63,30 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> + <form name="EditArticle" target="createBlogArticle" title="" type="upload" skip-end="true" default-map-name="blogEntry" + default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox"> + <alt-target use-when="contentId!=void&&contentId!=null" target="updateBlogArticle"/> + <field name="blogContentId"><hidden value="${parameters.blogContentId}"/></field> + <field name="contentId" title="${uiLabelMap.ContentBlogEntryId}" use-when="contentId!=void&&contentId!=null"><display/></field> + <field name="contentName" title="${uiLabelMap.ContentArticleName}"><text size="40"/></field> + <field name="description"><textarea cols="60" rows="2"/></field> + <field name="summaryData" title="${uiLabelMap.ContentSummary}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="60" rows="4"/></field> + <field name="articleData" title="${uiLabelMap.ContentBlogArticle}" widget-style="inputBox dojo-ResizableTextArea"><textarea cols="100" rows="20" visual-editor-enable="true"/></field> + <field name="uploadedFile" title="${uiLabelMap.ContentImage}"><file size="25"/></field> + <field name="templateDataResourceId" title="${uiLabelMap.ContentTemplate}"> + <drop-down> + <option key="BLOG_TPL_TOPLEFT" description="${uiLabelMap.EcommerceBlogTopLeft}"/> + <option key="BLOG_TPL_TOPCENTER" description="${uiLabelMap.EcommerceBlogTopCenter}"/> + </drop-down> + </field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> + <drop-down no-current-selected-key="CTNT_INITIAL_DRAFT"> + <option key="CTNT_PUBLISHED" description="${uiLabelMap.EcommerceBlogPublish}"/> + <option key="CTNT_INITIAL_DRAFT" description="${uiLabelMap.EcommerceBlogPreview}"/> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + </forms> Modified: ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/forum/BlogScreens.xml Thu Nov 18 08:32:31 2010 @@ -202,7 +202,7 @@ under the License. <decorator-screen name="blogArtDecorator"> <decorator-section name="body"> <sub-content content-id="${contentId}" map-key="IMAGE"/> - <include-form name="EditArticle" location="component://ecommerce/widget/blog/BlogForms.xml"/> + <include-form name="EditArticle" location="component://content/widget/forum/BlogForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jquery/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/widget/CommonScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/humanres/widget/CommonScreens.xml Thu Nov 18 08:32:31 2010 @@ -69,7 +69,7 @@ under the License. <screen name="OrgTree"> <section> <actions> - <set field="partyId" value="Company"/> + <set field="partyId" from-field="defaultOrganizationPartyId"/> </actions> <widgets> <screenlet title="${uiLabelMap.FormFieldTitle_company}"> Modified: ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml Thu Nov 18 08:32:31 2010 @@ -494,6 +494,10 @@ <value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">ä¼åæ è¯</value> </property> + <property key="MarketingContactListPartiesImport"> + <value xml:lang="en">Import Parties</value> + <value xml:lang="th">à¸à¸³à¹à¸à¹à¸²à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> + </property> <property key="MarketingContactListPreferredContactMech"> <value xml:lang="en">Preferred Contact Mechanism</value> <value xml:lang="es">Mecanismo de contacto</value> @@ -1657,6 +1661,10 @@ <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">æ¥æ¾èç³»å表ä¼å</value> </property> + <property key="PageTitleFindImportContactListParties"> + <value xml:lang="en">Find Import Contact List Parties</value> + <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹à¹à¸à¸·à¹à¸à¸à¸²à¸£à¸à¸³à¹à¸à¹à¸²</value> + </property> <property key="PageTitleFindMarketingCampaignRole"> <value xml:lang="en">Find Marketing Campaign Role</value> <value xml:lang="es">Buscar rol de campaña</value> Modified: ofbiz/branches/jquery/applications/marketing/data/MarketingHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/data/MarketingHelpData.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/data/MarketingHelpData.xml (original) +++ ofbiz/branches/jquery/applications/marketing/data/MarketingHelpData.xml Thu Nov 18 08:32:31 2010 @@ -48,6 +48,11 @@ under the License. <Content contentId="MARKETING_EditContL" contentTypeId="DOCUMENT" contentName="MARKETING Edit contactlist" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_EditContL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="MARKETING_ContLsts" contentIdTo="MARKETING_EditContL" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="MARKETING_EditContactList"/> + <DataResource dataResourceId="MARKETING_ImpoContLP" localeString="en" dataResourceTypeId="OFBIZ_FILE" + objectInfo="applications/marketing/data/helpdata/HELP_MARKETING_ImportContactListParties.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Marketing Main Help" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="MARKETING_ImpoContLP" contentTypeId="DOCUMENT" contentName="MARKETING Import contactlist Parties" templateDataResourceId="HELP_TEMPL" dataResourceId="MARKETING_ImpoContLP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> + <ContentAssoc contentId="MARKETING_ContLsts" contentIdTo="MARKETING_ImpoContLP" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="MARKETING_FindImportContactListParties"/> + <!-- Chapter SFA --> <DataResource dataResourceId="HELP_SFA" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/marketing/data/helpdata/HELP_SFA.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" Modified: ofbiz/branches/jquery/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml (original) +++ ofbiz/branches/jquery/applications/marketing/data/helpdata/HELP_MARKETING_ContactLists.xml Thu Nov 18 08:32:31 2010 @@ -30,5 +30,6 @@ </para> <xi:include href="HELP_MARKETING_FindContactLists.xml" /> <xi:include href="HELP_MARKETING_EditContactList.xml" /> + <xi:include href="HELP_MARKETING_ImportContactListParties.xml" /> </section> Modified: ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/marketing/webapp/marketing/WEB-INF/controller.xml Thu Nov 18 08:32:31 2010 @@ -321,6 +321,12 @@ under the License. <response name="success" type="view" value="ListContactListParties"/> <response name="error" type="view" value="ListContactListParties"/> </request-map> + <request-map uri="importContactListParties"> + <security https="true" auth="true"/> + <event type="simple" path="component://marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml" invoke="importContactListParties"/> + <response name="success" type="request-redirect" value="FindImportContactListParties"/> + <response name="error" type="request-redirect" value="FindImportContactListParties"/> + </request-map> <request-map uri="contactListOptOut" track-serverhit="false" track-visit="false"> <security https="true" auth="false"/> <response name="success" type="view" value="ContactListOptOut"/> @@ -329,6 +335,7 @@ under the License. <request-map uri="ListContactListCommEvents"><security https="true" auth="true"/><response name="success" type="view" value="ListContactListCommEvents"/></request-map> <request-map uri="EditContactListCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="EditContactListCommEvent"/></request-map> <request-map uri="FindContactListCommEvents"><security https="true" auth="true"/><response name="success" type="view" value="FindContactListCommEvents"/></request-map> + <request-map uri="FindImportContactListParties"><security https="true" auth="true"/><response name="success" type="view" value="FindImportContactListParties"/></request-map> <request-map uri="PreviewContactListCommEvent"> <security https="true" auth="true"/> <response name="success" type="view" value="PreviewContactListCommEvent"/> @@ -360,6 +367,10 @@ under the License. </response> <response name="error" type="view" value="ListContactListParties"/> </request-map> + <request-map uri="ContactMechTypeOnly"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ContactMechTypeOnly"/> + </request-map> <!-- Lookup request mappings --> @@ -436,6 +447,9 @@ under the License. <view-map name="EditContactListCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#EditContactListCommEvent"/> <view-map name="FindContactListCommEvents" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindContactListCommEvents"/> <view-map name="PreviewContactListCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#PreviewContactListCommEvent"/> + <view-map name="FindImportContactListParties" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindImportContactListParties"/> + + <view-map name="ContactMechTypeOnly" type="screen" page="component://marketing/widget/sfa/AccountScreens.xml#ContactMechTypeOnly"/> <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/> <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/> Modified: ofbiz/branches/jquery/applications/marketing/widget/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/ContactListForms.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/ContactListForms.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/ContactListForms.xml Thu Nov 18 08:32:31 2010 @@ -212,7 +212,13 @@ under the License. </row-actions> <field name="contactListId"><hidden/></field> - <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field> + <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"> + <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> + <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId"/> + </sub-hyperlink> + </display-entity> + </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> @@ -237,6 +243,83 @@ under the License. </hyperlink> </field> </form> + + <form name="FindImportContactListParties" type="single" target="FindImportContactListParties" title="" focus-field-name="contactMechTypeId" + header-row-style="header-row" default-table-style="basic-table"> + <field name="contactListId"><hidden/></field> + <field name="statusId"><hidden value="PARTY_DISABLED"/></field> + <field name="statusId_op"><hidden value="notEqual"/></field> + <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyTypeId"> + <drop-down allow-empty="true"> + <entity-options entity-name="PartyType" description="${description}"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"> + <drop-down> + <option key="" description="${uiLabelMap.CommonAnyRoleType}"/> + <entity-options entity-name="RoleType" description="${description}"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="contactMechTypeId" map-name="contactList" event="onfocus" action="javascript:ajaxUpdateAreas('contactMechContainer,ContactMechTypeOnly,contactMechTypeId=' + this.value);this.disabled=true;"><text/></field> + <field name="contactMechContainer" id-name="contactMechContainer" title=" "><container/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> + </form> + <form name="ListImportContactListParties" type="multi" title="" list-name="listIt" target="importContactListParties?contactListId=${parameters.contactListId}" paginate-target="FindImportContactListParties" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <set field="parameters.contactMechTypeId" from-field="contactMechTypeId"/> + <service result-map-list="listIt" result-map="result" service-name="performFind"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" value="PartyRoleAndContactMechDetail"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + <field-map field-name="fieldList" from-field="selectedFields"/> + <field-map field-name="distinct" value="Y"/> + </service> + </actions> + <row-actions> + <service service-name="getPartyPostalAddress" result-map="postalAddress"> + <field-map field-name="partyId" from-field="partyId"/> + </service> + <service service-name="getPartyTelephone" result-map="telephone"> + <field-map field-name="partyId" from-field="partyId"/> + </service> + <service service-name="getPartyContactMechValueMaps" result-map="contactMechResults"> + <field-map field-name="partyId" from-field="partyId"/> + <field-map field-name="contactMechTypeId" from-field="contactMechTypeId"/> + </service> + <set field="contactMech" from-field="contactMechResults.valueMaps[0].contactMech" type="Object"/> + </row-actions> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> + <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"> + <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> + <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId"/> + </sub-hyperlink> + </display-entity> + </field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="toName" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="attnName" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="address1" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="address2" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="city" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="abbreviation" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="postalCode" map-name="postalAddress"><display/></field> + <field use-when="contactMechTypeId.equals("POSTAL_ADDRESS")" name="countryGeoId" map-name="postalAddress"> + <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName}"/> + </field> + <field use-when="contactMechTypeId.equals("TELECOM_NUMBER")" name="countryCode" map-name="telephone"><display/></field> + <field use-when="contactMechTypeId.equals("TELECOM_NUMBER")" name="areaCode" map-name="telephone"><display/></field> + <field use-when="contactMechTypeId.equals("TELECOM_NUMBER")" name="contactNumber" map-name="telephone"><display/></field> + <field use-when="contactMechTypeId.equals("TELECOM_NUMBER")" name="extension" map-name="telephone"><display/></field> + <field use-when="!contactMechTypeId.equals("POSTAL_ADDRESS")&&!contactMechTypeId.equals("TELECOM_NUMBER")" name="infoString" map-name="contactMech"><display/></field> + <field name="submitButton" title="${uiLabel.CommonSubmit}"><submit/></field> + </form> <form name="EditContactListCommEvent" default-map-name="communicationEvent" target="updateContactListCommEvent" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/branches/jquery/applications/marketing/widget/ContactListMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/ContactListMenus.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/ContactListMenus.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/ContactListMenus.xml Thu Nov 18 08:32:31 2010 @@ -36,6 +36,11 @@ under the License. <parameter param-name="contactListId"/> </link> </menu-item> + <menu-item name="ContactListImportParty" title="${uiLabelMap.MarketingContactListPartiesImport}"> + <link target="FindImportContactListParties"> + <parameter param-name="contactListId"/> + </link> + </menu-item> </menu> <menu name="ContactListCommBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> Modified: ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/ContactListScreens.xml Thu Nov 18 08:32:31 2010 @@ -339,7 +339,35 @@ under the License. </widgets> </section> </screen> + <screen name="FindImportContactListParties"> + <section> + <actions> + <set field="titleProperty" value="PageTitleFindImportContactListParties"/> + <set field="contactListTabButtonItem" value="ContactListImportParty"/> + <set field="labelTitleProperty" value="PageTitleFindImportContactListParties"/> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindImportContactListParties?contactListId=${parameters.contactListId}"/> + <set field="contactListId" from-field="parameters.contactListId"/> + <entity-one entity-name="ContactList" value-field="contactList"/> + <set field="contactMechTypeId" from-field="contactList.contactMechTypeId"/> + <set field="selectedFields[+0]" value="partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindImportContactListParties" location="component://marketing/widget/ContactListForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListImportContactListParties" location="component://marketing/widget/ContactListForms.xml"/> + </decorator-section> + </decorator-screen> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="LookupContactList"> <section> <actions> Modified: ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml?rev=1036344&r1=1036343&r2=1036344&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml (original) +++ ofbiz/branches/jquery/applications/marketing/widget/sfa/AccountScreens.xml Thu Nov 18 08:32:31 2010 @@ -100,6 +100,7 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> <section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |