svn commit: r1128799 - in /ofbiz/trunk: applications/product/ applications/product/config/ applications/product/data/ applications/product/script/or
Locked
svn commit: r1128799 - in /ofbiz/trunk: applications/product/ applications/product/config/ applications/product/data/ applications/product/script/or
 
|
Author: hansbak
Date: Sun May 29 01:23:50 2011 New Revision: 1128799 URL: http://svn.apache.org/viewvc?rev=1128799&view=rev Log: Cleanup, re-organize Catalog function in catalog, for consistancy reasons added a catalog option showing always a list (most installations only have one or a few) add a 'create seo urls's for products and categories' tab. remove contentid from webabalytics demo data Removed: ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/ofbiz-component.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml ofbiz/trunk/applications/product/servicedef/services.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun May 29 01:23:50 2011 @@ -9230,7 +9230,7 @@ <value xml:lang="zh">å°å</value> <value xml:lang="zh_TW">å°å</value> </property> - <property key="ProductAdvancedSearch"> + <property key="ProductAdvancedSearch">Product <value xml:lang="cs">RozÅ¡ÃÅené hledánÃ</value> <value xml:lang="de">Erweiterte Suche</value> <value xml:lang="en">Advanced Search</value> @@ -10436,6 +10436,9 @@ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_DELETE or CATALOG_ADMIN permission</value> <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_DELETE o CATALOG_ADMIN</value> </property> + <property key="ProductCatalogSeoCreate"> + <value xml:lang="en">Create SEO category/products</value> + </property> <property key="ProductCatalogUpdatePermissionError"> <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_UPDATE or CATALOG_ADMIN permission</value> <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_UPDATE o CATALOG_ADMIN</value> Modified: ofbiz/trunk/applications/product/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/ofbiz-component.xml (original) +++ ofbiz/trunk/applications/product/ofbiz-component.xml Sun May 29 01:23:50 2011 @@ -42,7 +42,6 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductPortletData.xml"/> - <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoWebAnalyticsContentData.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="model" loader="main" location="servicedef/services_facility.xml"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Sun May 29 01:23:50 2011 @@ -522,6 +522,9 @@ under the License. <simple-method method-name="createMissingCategoryAndProductAltUrls" short-description="create missing category and product alternative urls."> <now-timestamp field="now"/> + <field-to-result field="parameters.prodCatalogId" result-name="prodCatalogId"/> + <set field="categoriesUpdated" value="0" type="Integer"/> + <set field="productsUpdated" value="0" type="Integer"/> <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> </entity-and> @@ -533,8 +536,8 @@ under the License. <entity-and list="productCategoryRollupList" entity-name="ProductCategoryRollup" filter-by-date="true"> <field-map field-name="parentProductCategoryId" from-field="rootProductCategoryId"/> </entity-and> - <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/> - <call-simple-method method-name="createMissingCategoryAltUrlInline"/> + <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/> + <call-simple-method method-name="createMissingCategoryAltUrlInline"/> </iterate> <iterate entry="productCategoryList" list="parameters.productCategories"> @@ -577,7 +580,12 @@ under the License. </else> </if-empty> <if-not-empty field="createSimpleTextContentForCategoryCtx.text"> - <call-service service-name="createSimpleTextContentForCategory" in-map-name="createSimpleTextContentForCategoryCtx"/> + <call-service service-name="createSimpleTextContentForCategory" in-map-name="`Ctx"/> + <calculate field="$categoriesUpdated"> + <calcop operator="add" field="categoriesUpdated"> + <number value="1"/> + </calcop> + </calculate> </if-not-empty> <check-errors/> </if-empty> @@ -616,11 +624,20 @@ under the License. </if-empty> <if-not-empty field="createSimpleTextContentForProductCtx.text"> <call-service service-name="createSimpleTextContentForProduct" in-map-name="createSimpleTextContentForProductCtx"/> + <calculate field="$productsUpdated"> + <calcop operator="add" field="productsUpdated"> + <number value="1"/> + </calcop> + </calculate> </if-not-empty> <check-errors/> </if-empty> </iterate> </iterate> + <set field="categoriesUpdatedMessage" value="Categories updated: ${categoriesUpdated}"/> + <field-to-list list="successMessageList" field="categoriesUpdatedMessage"/> + <set field="productsUpdatedMessage" value="Products updated: ${productsUpdated}"/> + <field-to-list list="successMessageList" field="productsUpdatedMessage"/> </simple-method> <simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline"> <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true"> Modified: ofbiz/trunk/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/servicedef/services.xml (original) +++ ofbiz/trunk/applications/product/servicedef/services.xml Sun May 29 01:23:50 2011 @@ -1611,6 +1611,6 @@ under the License. <service name="createMissingCategoryAndProductAltUrls" engine="simple" location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="createMissingCategoryAndProductAltUrls" auth="true" use-transaction="false"> <description>Create missing Category and Product Alternative URLs</description> - <attribute name="prodCatalogId" mode="IN" type="String" optional="false"/> + <attribute name="prodCatalogId" mode="INOUT" type="String" optional="false"/> </service> </services> Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sun May 29 01:23:50 2011 @@ -1384,15 +1384,20 @@ under the License. </request-map> <!-- ================ ProdCatalog Requests ================= --> - <request-map uri="FindProdCatalog"> + <request-map uri="FindCatalog"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindProdCatalog"/> + <response name="success" type="view" value="FindCatalog"/> </request-map> <request-map uri="EditProdCatalog"> <security https="true" auth="true"/> <response name="success" type="view" value="EditProdCatalog"/> </request-map> + <request-map uri="CreateSeoProdCatalog"> + <security https="true" auth="true"/> + <event type="service" path="" invoke="createMissingCategoryAndProductAltUrls"/> + <response name="success" type="request-redirect" value="EditProdCatalog"/> + </request-map> <request-map uri="createProdCatalog"> <security https="true" auth="true"/> <event type="service" path="" invoke="createProdCatalog"/> @@ -3079,6 +3084,12 @@ under the License. <view-map name="exportproducts" type="screen" page="component://product/widget/catalog/FindScreens.xml#exportproducts"/> <view-map name="FindProductById" type="screen" page="component://product/widget/catalog/FindScreens.xml#FindProductById"/> + <view-map name="FindCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindCatalog"/> + <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/> + <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/> + <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/> + <view-map name="EditProdCatalogParties" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogParties"/> + <view-map name="FindCategory" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#FindCategory"/> <view-map name="EditCategory" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategory"/> <view-map name="EditCategoryContent" type="screen" page="component://product/widget/catalog/CategoryScreens.xml#EditCategoryContent"/> @@ -3157,12 +3168,6 @@ under the License. <view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/> <view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/> - <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/> - <view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/> - <view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/> - <view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/> - <view-map name="EditProdCatalogParties" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogParties"/> - <view-map name="FindProductPromo" type="screen" page="component://product/widget/catalog/PromoScreens.xml#FindProductPromo"/> <view-map name="EditProductPromo" type="screen" page="component://product/widget/catalog/PromoScreens.xml#EditProductPromo"/> <view-map name="EditProductPromoRules" type="screen" page="component://product/widget/catalog/PromoScreens.xml#EditProductPromoRules"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Sun May 29 01:23:50 2011 @@ -19,8 +19,9 @@ under the License. --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="CatalogAppBar" title="${uiLabelMap.ProductCatalogManager}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="products" title="${uiLabelMap.ProductProducts}"><link target="FindProduct"/></menu-item> + <menu-item name="catalogs" title="${uiLabelMap.ProductCatalogs}"><link target="FindCatalog"/></menu-item> <menu-item name="categories" title="${uiLabelMap.ProductCategories}"><link target="FindCategory"/></menu-item> + <menu-item name="products" title="${uiLabelMap.ProductProducts}"><link target="FindProduct"/></menu-item> <menu-item name="featurecats" title="${uiLabelMap.ProductFeatureCats}"><link target="EditFeatureCategories"/></menu-item> <menu-item name="promos" title="${uiLabelMap.ProductPromos}"><link target="FindProductPromo"/></menu-item> <menu-item name="pricerules" title="${uiLabelMap.ProductPriceRules}"><link target="FindProductPriceRules"/></menu-item> @@ -228,6 +229,17 @@ under the License. </menu-item> </menu> + <menu name="CatalogSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> + <menu-item name="EditProductCatalog" title="${uiLabelMap.ProductNewProdCatalog}" widget-style="buttontext create"> + <link target="EditProdCatalog"/> + </menu-item> + <menu-item name="CreateSeo" title="${uiLabelMap.ProductCatalogSeoCreate}"> + <link target="CreateSeoProdCatalog"> + <parameter param-name="prodCatalogId" from-field="parameters.prodCatalogId"/> + </link> + </menu-item> + </menu> + <menu name="PriceRulesButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="FindRules" title="${uiLabelMap.CommonAdd}/${uiLabelMap.ProductFindRule}"> <link target="FindProductPriceRules"/> Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Sun May 29 01:23:50 2011 @@ -20,22 +20,48 @@ under the License. <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="FindCatalog"> + <section> + <actions> + <set field="titleProperty" value="PageTitleFindCatalog"/> + <set field="headerItem" value="catalogs"/> + <set field="tabButtonItem" value="FindCatalog"/> + <set field="labelTitleProperty" value="ProductCatalog"/> + </actions> + <widgets> + <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="menu-bar"> + </decorator-section> + <decorator-section name="search-options"> + <include-form name="FindCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditProdCatalog"> <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalog"/> <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCatalog"/> - - <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> </actions> <widgets> <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> - </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}"> <label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label> <include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> @@ -51,12 +77,8 @@ under the License. <set field="titleProperty" value="PageTitleEditProductCatalogCategories"/> <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCategories"/> - - <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> - <entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategories"> - <field-map field-name="prodCatalogId"/> + <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> <order-by field-name="prodCatalogCategoryTypeId"/> <order-by field-name="sequenceNum"/> <order-by field-name="productCategoryId"/> @@ -68,9 +90,6 @@ under the License. <widgets> <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductCategories} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> - </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogCategories}"> <include-form name="EditProdCatalogCategories" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> @@ -88,12 +107,8 @@ under the License. <set field="titleProperty" value="PageTitleEditProductCatalogParties"/> <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="PartyParties"/> - - <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> - <entity-and entity-name="ProdCatalogRole" list="prodCatalogRoleList"> - <field-map field-name="prodCatalogId"/> + <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> <order-by field-name="sequenceNum"/> <order-by field-name="partyId"/> </entity-and> @@ -101,9 +116,6 @@ under the License. <widgets> <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.PartyParties} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> - </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogParties}"> <include-form name="UpdateProdCatalogToParty" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> @@ -121,12 +133,8 @@ under the License. <set field="titleProperty" value="PageTitleEditProductCatalogStores"/> <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductStores"/> - - <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> - <entity-and entity-name="ProductStoreCatalog" list="productStoreCatalogList"> - <field-map field-name="prodCatalogId"/> + <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> <order-by field-name="sequenceNum"/> <order-by field-name="productStoreId"/> </entity-and> @@ -134,9 +142,6 @@ under the License. <widgets> <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductStores} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> - </container> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogStores}"> <include-form name="UpdateProductStoreCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> </screenlet> @@ -148,35 +153,4 @@ under the License. </widgets> </section> </screen> - <screen name="FindProdCatalog"> - <section> - <actions> - <set field="titleProperty" value="PageTitleFindProductCatalog"/> - - <entity-condition entity-name="ProdCatalog" list="prodCatalogs"> - <order-by field-name="catalogName"/> - </entity-condition> - </actions> - <widgets> - <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <!-- do check for CATALOG, _VIEW permission --> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <screenlet title="${uiLabelMap.ProductProductCatalogsList}"> - <include-form name="ListProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> - </screenlet> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Sun May 29 01:23:50 2011 @@ -55,34 +55,34 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <!-- do check for CATALOG, _VIEW permission --> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="prodCatalogId"/></not> - </and> - </condition> - <widgets> - <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="left-column"> <include-screen name="leftbar"/> </decorator-section> <decorator-section name="body"> <section> - <!-- do check for CATALOG, _VIEW permission --> <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> + <or> + <if-has-permission permission="CATALOG" action="_ADMIN"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> </condition> + <actions> + <set field="prodCatalogId" from-field="parameters.prodCatalogId"/> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> + </actions> <widgets> - <container style="button-bar"> - <link target="EditProdCatalog" text="${uiLabelMap.ProductNewProdCatalog}" style="buttontext create"/> - </container> - + <section> + <condition> + <not><if-empty field="prodCatalogId"/></not> + </condition> + <widgets> + <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <container> + <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + </container> + </widgets> + </section> <decorator-section-include name="body"/> </widgets> <fail-widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProdCatalogForms.xml Sun May 29 01:23:50 2011 @@ -20,7 +20,42 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListProdCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindProdCatalog" + <form name="FindCatalog" type="single" target="FindCatalog" title="" default-map-name="catalog" + header-row-style="header-row" default-table-style="basic-table" > + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="prodCatalogId" title="${uiLabelMap.ProdCatalogId}"><text-find/></field> + <field name="prodCatalogName" title="${uiLabelMap.FormFieldTitle_prodCatalogName}"><text-find/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> + <submit button-type="button"/> + </field> + </form> + + <form name="ListCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindCatalog" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> + <actions> + <set field="entityName" value="ProdCatalog"/> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="requestParameters"/> + <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="orderBy" from-field="parameters.sortField"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + <field-map field-name="noConditionFind" value="Y"/> + </service> + </actions> + <field name="prodCatalogId" sort-field="true"> + <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditCatalog"> + <parameter param-name="prodCatalogId"/> + </hyperlink> + </field> + + <field name="prodCatalogId" sort-field="true"> + <hyperlink target="EditProdCatalog?prodCatalogId=${prodCatalogId}" description="${prodCatalogId}"></hyperlink> + </field> + <field name="catalogName" sort-field="true"><display/></field> + <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field> + </form> + <!-- form name="ListProdCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindProdCatalog" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> <actions> <set field="parameters.sortField" from-field="parameters.sortField" default-value="prodCatalogId"/> @@ -35,7 +70,7 @@ under the License. </field> <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" sort-field="true"><display/></field> <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field> - </form> + </form--> <form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog" header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog"> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1128799&r1=1128798&r2=1128799&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Sun May 29 01:23:50 2011 @@ -129,8 +129,8 @@ under the License. <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="[hidden email]"/> <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_EMAIL_TEMPLATE" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListEmailTemplate"/> - <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/> - <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/> + <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --" isEnabled="Y" description="This is code provided from google analytics"/> + <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --" isEnabled="Y" description="This is code provided from bing analytics"/> <ProductStoreFacility productStoreId="9000" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/> <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="9000" fromDate="2001-05-13 12:00:00.0"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |