svn commit: r1153560 [8/15] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1153560 [8/15] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogScreens.xml Wed Aug 3 16:12:58 2011 @@ -35,8 +35,6 @@ under the License. <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> @@ -55,7 +53,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalog"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCatalog"/> <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> </actions> @@ -71,11 +68,33 @@ under the License. </widgets> </section> </screen> + <screen name="EditProdCatalogSection"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditProductCatalog"/> + <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="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-menu name="CatalogTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="CatalogSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <label style="h1">${uiLabelMap.ProductCatalog} ${uiLabelMap.CommonFor} "${prodCatalog.catalogName}" [${prodCatalogId}]</label> + <screenlet title="${uiLabelMap.PageTitleEditProductCatalog}"> + <label style="h3">${uiLabelMap.ProductCatalogEmptyWarning}</label> + <include-form name="EditProdCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditProdCatalogCategories"> <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalogCategories"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductCategories"/> <entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategories"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> @@ -105,7 +124,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalogParties"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="PartyParties"/> <entity-and entity-name="ProdCatalogRole" list="prodCatalogRoleList"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> @@ -114,7 +132,7 @@ under the License. </entity-and> </actions> <widgets> - <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogParties}"> <include-form name="UpdateProdCatalogToParty" location="component://product/widget/catalog/ProdCatalogForms.xml"/> @@ -131,7 +149,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditProductCatalogStores"/> - <set field="headerItem" value="catalog"/> <set field="tabButtonItem" value="ProductStores"/> <entity-and entity-name="ProductStoreCatalog" list="productStoreCatalogList"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> @@ -140,7 +157,7 @@ under the License. </entity-and> </actions> <widgets> - <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonCatalogDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditProductCatalogStores}"> <include-form name="UpdateProductStoreCatalog" location="component://product/widget/catalog/ProdCatalogForms.xml"/> @@ -153,4 +170,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryForms.xml Wed Aug 3 16:12:58 2011 @@ -250,7 +250,7 @@ under the License. </hyperlink> </field> - <field name="productCategoryTypeId" sort-field="true"><display/></field> + <field name="productCategoryTypeId" sort-field="true"><display-entity entity-name="ProductCategoryType" description="${description}"/></field> <field name="primaryParentCategoryId" sort-field="true"><display/></field> <field name="categoryName" sort-field="true"><display/></field> <field name="description" sort-field="true"><display/></field> @@ -290,4 +290,31 @@ under the License. <field use-when="content == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field use-when="content != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + + <form name="EditCategoryContentDownload" type="upload" target="updateDownloadContentForCategory" title="${uiLabelMap.ProductUpdateDownloadContentCategory}"> + <alt-target use-when="contentId==null" target="createDownloadContentForCategory"/> + <auto-fields-entity entity-name="ProductCategoryContent" map-name="productCategoryContentData"/> + <field name="fromDate" use-when="contentId==null" title="${uiLabelMap.CommonFromDate}*" ><date-time/></field> + <field name="fromDate" use-when="contentId!=null" title="${uiLabelMap.CommonFromDate}" ><display/></field> + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field> + <field name="purchaseFromDate" title="${uiLabelMap.ProductPurchaseFromDate}"></field> + <field name="purchaseThruDate" title="${uiLabelMap.ProductPurchaseThruDate}"></field> + <field name="useCountLimit" title="${uiLabelMap.ProductUseCountLimit}"></field> + <field name="useDaysLimit" title="${uiLabelMap.ProductUseTime}"></field> + + <field name="description" title="${uiLabelMap.ProductCategoryDescription}" map-name="content"><text size="40"/></field> + <field use-when="contentId == null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductOptional}"><text maxlength="20"/></field> + <field use-when="contentId != null" name="contentId" title="${uiLabelMap.ProductContentId}" tooltip="${uiLabelMap.ProductNotModificationRecrationProductContentAssociation}" map-name="productContentData" > + <hyperlink description="${contentId} ${contentName}" target="/content/control/editContent" target-type="inter-app"> + <parameter param-name="contentId"/> + </hyperlink> + </field> + <field name="imageData" title="${uiLabelMap.ProductFile}"><file/></field> + <field name="fileDataResourceId"><hidden/></field> + <field name="productCategoryId"><hidden/></field> + <field name="prodCatContentTypeId"><hidden/></field> + <field name="dataResourceTypeId"><hidden/></field> + <field use-when="contentId == null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field use-when="contentId != null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CategoryScreens.xml Wed Aug 3 16:12:58 2011 @@ -22,6 +22,9 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> <screen name="CommonCategoryDecorator"> <section> + <actions> + <set field="headerItem" value="categories"/> + </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="left-column"> @@ -50,7 +53,7 @@ under the License. <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> - <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label> + <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.categoryName} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label> </container> </widgets> <fail-widgets> @@ -89,8 +92,6 @@ under the License. <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="FindCategory" location="component://product/widget/catalog/CategoryForms.xml"/> </decorator-section> @@ -112,18 +113,15 @@ under the License. <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategory"/> <set field="labelTitleProperty" value="ProductCategory"/> - <set field="productCategoryId" from-field="parameters.productCategoryId"/> <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> <order-by field-name="description"/> </entity-condition> - <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy"/> </actions> <widgets> - <decorator-screen name="CommonCategoryDecorator"> + <decorator-screen name="CommonCategoryDecorator"> <decorator-section name="body"> <platform-specific> <html><html-template location="component://product/webapp/catalog/category/EditCategory.ftl"/></html> @@ -133,11 +131,77 @@ under the License. </widgets> </section> </screen> + <screen name="EditCategorySection"> + <section> + <actions> + <set field="titleProperty" value="PageTitleEditProductCategories"/> + <set field="headerItem" value="categories"/> + <set field="tabButtonItem" value="EditCategory"/> + <set field="labelTitleProperty" value="ProductCategory"/> + <set field="productCategoryId" from-field="parameters.productCategoryId"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> + <entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"> + <order-by field-name="description"/> + </entity-condition> + <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <or> + <if-has-permission permission="CATALOG" action="_ADMIN"/> + <if-has-permission permission="CATALOG" action="_CREATE"/> + <if-has-permission permission="CATALOG" action="_UPDATE"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> + </condition> + <actions> + <set field="productCategoryId" from-field="parameters.productCategoryId"/> + <entity-one entity-name="ProductCategory" value-field="productCategory"/> + </actions> + <widgets> + <section> + <condition> + <not><if-empty field="productCategory"/></not> + </condition> + <widgets> + <include-menu name="CategoryTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <container> + <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}] ${${extraFunctionName}}</label> + </container> + </widgets> + <fail-widgets> + <section> + <condition> + <if-compare operator="not-equals" value="EditCategory" field="tabButtonItem"/> + </condition> + <widgets> + <include-menu name="CategorySubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + </widgets> + </section> + </fail-widgets> + </section> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> + </fail-widgets> + </section> + <platform-specific> + <html><html-template location="component://product/webapp/catalog/category/EditCategory.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditCategoryContent"> <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryContent"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryContent"/> <set field="labelTitleProperty" value="ProductCategoryContent"/> @@ -161,7 +225,6 @@ under the License. <screenlet title="${uiLabelMap.ProductAddContentCategory}"> <include-form name="AddCategoryContentAssoc" location="component://product/widget/catalog/CategoryForms.xml"/> </screenlet> - <platform-specific> <html><html-template location="component://product/webapp/catalog/category/EditCategoryContent.ftl"/></html> </platform-specific> @@ -174,7 +237,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryContentContent"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryContent"/> <set field="labelTitleProperty" value="ProductCategoryContent"/> @@ -221,7 +283,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryRollup"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryRollup"/> <set field="labelTitleProperty" value="ProductRollup"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> @@ -251,7 +312,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryProducts"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryProducts"/> <set field="labelTitleProperty" value="ProductProducts"/> @@ -274,7 +334,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryProductCatalogs"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryProdCatalogs"/> <set field="labelTitleProperty" value="ProductCatalogs"/> @@ -348,7 +407,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryParties"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryParties"/> <set field="labelTitleProperty" value="PartyParties"/> @@ -380,7 +438,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleEditCategoryAttributes"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditCategoryAttributes"/> <set field="labelTitleProperty" value="ProductCategoryAttributes"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> @@ -429,7 +486,6 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleCreateProductCategoryCheckExisting"/> - <set field="headerItem" value="categories"/> <set field="labelTitleProperty" value="ProductCreateProductInCategory"/> <set field="productCategoryId" from-field="parameters.productCategoryId"/> @@ -456,10 +512,8 @@ under the License. <property-map resource="ProductEntityLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleEditProductCategoryLink"/> - <set field="headerItem" value="categories"/> <set field="tabButtonItem" value="EditProductCategoryLinks"/> <set field="labelTitleProperty" value="ProductCategoryLinks"/> - <set field="productCategoryId" from-field="parameters.productCategoryId"/> <set field="linkSeqId" from-field="parameters.linkSeqId"/> <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> @@ -480,5 +534,4 @@ under the License. </widgets> </section> </screen> - </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml Wed Aug 3 16:12:58 2011 @@ -43,7 +43,7 @@ under the License. <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.13.custom.min.js" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> @@ -53,6 +53,9 @@ under the License. <screen name="CommonCatalogDecorator"> <section> + <actions> + <set field="headerItem" value="catalogs"/> + </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="left-column"> @@ -109,45 +112,35 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="productStoreId"/></not> - </and> - </condition> - <widgets> - <include-menu name="ProductStoreTabBar" 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="_CREATE"/> + <if-has-permission permission="CATALOG" action="_UPDATE"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> </condition> + <actions> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <entity-one entity-name="ProductStore" value-field="productStore"/> + </actions> <widgets> <section> - <condition><not><if-empty field="productStoreId"/></not></condition> + <condition><not><if-empty field="productStore"/></not></condition> <widgets> <container> + <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label> </container> <section> - <widgets> - <container> - <link target="EditProductStore" text="${uiLabelMap.ProductNewProductStore}" style="buttontext"/> - </container> - </widgets> - </section> - <section> <condition> - <if-compare field="titleProperty" operator="equals" value="PageTitleEditProductStore"/> + <if-compare operator="equals" value="EditProductStore" field="tabButtonItem"/> </condition> <widgets> <container style="button-bar"> @@ -157,8 +150,17 @@ under the License. </widgets> </section> </widgets> + <fail-widgets> + <section> + <condition> + <if-compare operator="not-equals" value="EditProductStore" field="tabButtonItem"/> + </condition> + <widgets> + <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + </widgets> + </section> + </fail-widgets> </section> - <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -175,7 +177,7 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> + <!--<decorator-section name="pre-body"> <section> <condition> <if-has-permission permission="CATALOG" action="_VIEW"/> @@ -184,7 +186,7 @@ under the License. <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> </widgets> </section> - </decorator-section> + </decorator-section>--> <decorator-section name="left-column"> <include-screen name="leftbar"/> </decorator-section> @@ -195,7 +197,7 @@ under the License. <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <!--<include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/>--> + <include-menu name="ShippingTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container> <label style="h1">${uiLabelMap[labelTitleProperty]}</label> </container> @@ -221,22 +223,16 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <include-menu name="WebAnalyticsTabBar" 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> <condition> <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> + <include-menu name="WebAnalyticsTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container style="no-clear"> <decorator-section-include name="body"/> </container> @@ -255,8 +251,8 @@ under the License. <section> <widgets> <include-screen name="keywordsearchbox"/> - <!--<include-screen name="sidecatalogs"/> - <include-screen name="sidedeepcategory"/>--> +<!-- <include-screen name="sidecatalogs"/>--> +<!-- <include-screen name="sidedeepcategory"/>--> <include-screen name="categorytree"/> <include-screen name="miniproductlist"/> </widgets> @@ -305,12 +301,13 @@ under the License. </actions> <widgets> <screenlet id="ProductCategoryProductsPanel" title="${uiLabelMap.ProductCategoryProducts}" collapsible="true"> - <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + <container id="miniproductlist"> + <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + </container> </screenlet> </widgets> </section> </screen> - <screen name="ChooseTopCategory"> <section> <actions> @@ -399,31 +396,43 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <if-has-permission permission="CATALOG" action="_VIEW"/> - </condition> - <widgets> - <include-menu name="ImageManagementTabBar" 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> <condition> <if-has-permission permission="CATALOG" action="_VIEW"/> </condition> <widgets> - <decorator-section-include name="body"/> + <include-menu name="ImageManagementTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <container style="h1"> + <label text=" "/> + </container> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> </fail-widgets> </section> + <decorator-section-include name="body"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="listMiniproduct"> + <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://product/webapp/catalog/WEB-INF/actions/find/miniproductlist.groovy"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://product/webapp/catalog/find/miniproductlist.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ConfigScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ConfigScreens.xml Wed Aug 3 16:12:58 2011 @@ -24,19 +24,6 @@ under the License. <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="configItemId"/></not> - </and> - </condition> - <widgets> - <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> @@ -51,6 +38,7 @@ under the License. <condition><not><if-empty field="configItemId"/></not></condition> <widgets> <container> + <include-menu name="ConfigItemTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}] ${${extraFunctionName}}</label> </container> <container style="button-bar"> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml Wed Aug 3 16:12:58 2011 @@ -24,14 +24,18 @@ <section> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="left-column"> + <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </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="_CREATE"/> + <if-has-permission permission="CATALOG" action="_UPDATE"/> + <if-has-permission permission="CATALOG" action="_VIEW"/> + </or> </condition> <widgets> <include-menu name="FeaturesTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml Wed Aug 3 16:12:58 2011 @@ -60,7 +60,7 @@ under the License. </or> </condition> <widgets> - <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <include-menu name="ProductSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content" alt="${product.internalName}"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> @@ -87,7 +87,7 @@ under the License. </widgets> </section> </screen> - + <screen name="FindProduct"> <section> <actions> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PromoScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/PromoScreens.xml Wed Aug 3 16:12:58 2011 @@ -27,19 +27,6 @@ under the License. <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-has-permission permission="CATALOG" action="_VIEW"/> - <not><if-empty field="productPromoId"/></not> - </and> - </condition> - <widgets> - <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="body"> <section> <!-- do check for CATALOG, _VIEW permission --> @@ -50,12 +37,13 @@ under the License. <section> <condition><not><if-empty field="productPromoId"/></not></condition> <widgets> - <container> - <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label> - </container> + <include-menu name="PromoTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> <container style="button-bar"> <link target="EditProductPromo" text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/> </container> + <container> + <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label> + </container> </widgets> </section> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml Wed Aug 3 16:12:58 2011 @@ -32,9 +32,6 @@ under the License. <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ProductProductStoreList}"> - <container style="button-bar"> - <link target="EditProductStore" text="${uiLabelMap.ProductCreateNewProductStore}" style="buttontext create"/> - </container> <include-form name="ListProductStore" location="component://product/widget/catalog/ProductStoreForms.xml"/> </screenlet> </decorator-section> @@ -73,17 +70,12 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="FindProductStoreRoles"/> <set field="labelTitleProperty" value="ProductProductStoreRoles"/> - <set field="productStoreId" from-field="parameters.productStoreId"/> <set field="parameters.fromDate" from-field="parameters.fromDate" type="Timestamp"/> <entity-one entity-name="ProductStoreRole" value-field="productStoreRole" auto-field-map="true"/> - <set field="parameters.productStoreId" value="${groovy:parameters.noConditionFind==null || parameters.noConditionFind=='N'?'':parameters.productStoreId}"/> </actions> <widgets> <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleEditProductStoreRoles}"> - <include-form name="EditProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> - </screenlet> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> <include-form name="FindProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> @@ -92,6 +84,9 @@ under the License. <include-form name="ListProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> </decorator-section> </decorator-screen> + <screenlet title="${uiLabelMap.PageTitleEditProductStoreRoles}"> + <include-form name="EditProductStoreRole" location="component://product/widget/catalog/StoreForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -104,10 +99,6 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStorePromos"/> <set field="labelTitleProperty" value="ProductPromotions"/> - - <set field="productStoreId" from-field="parameters.productStoreId"/> - <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <set field="userEntered" from-field="parameters.userEntered"/> <set field="activeOnly" from-field="parameters.activeOnly" default-value="true"/> <entity-condition entity-name="ProductStorePromoAndAppl" list="productStorePromoAndAppls" filter-by-date="${activeOnly}"> @@ -202,13 +193,8 @@ under the License. <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreWebSites"/> <set field="labelTitleProperty" value="ProductProductStoreWebSites"/> - - <set field="productStoreId" from-field="parameters.viewProductStoreId"/> - <set field="productStoreId" from-field="parameters.productStoreId" default-value="${productStoreId}"/> - <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/> - <entity-condition entity-name="WebSite" list="storeWebSites"> - <condition-expr field-name="productStoreId" from-field="productStoreId"/> + <condition-expr field-name="productStoreId" from-field="parameters.productStoreId"/> <order-by field-name="siteName"/> </entity-condition> <entity-condition entity-name="WebSite" list="webSites"> @@ -310,10 +296,6 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ProductNewShipmentEstimate}"> - <container style="button-bar"> - <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext expand-all" url-mode="plain"/> - <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext collapse-all" url-mode="plain"/> - </container> <include-form name="AddShipmentCostEstimate" location="component://product/widget/catalog/ProductStoreForms.xml"/> </screenlet> </widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionForms.xml Wed Aug 3 16:12:58 2011 @@ -62,7 +62,7 @@ under the License. <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field> - <field name="automaticExtend"> + <field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel--> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonYes}"/> <option key="N" description="${uiLabelMap.CommonNo}"/> @@ -281,13 +281,14 @@ under the License. </entity-options> </drop-down> </field> - <field name="automaticExtend"> + <field name="automaticExtend" title="Automatic Extend" ><!-- TODO: ${uiLabelMap.FormFieldTitle_automaticExtend} get overwritten with the description of the field from the entitymodel--> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonYes}"/> <option key="N" description="${uiLabelMap.CommonNo}"/> </drop-down> </field> - <field name="canclAutmExtTimeUomId"> + <field name="canclAutmExtTime" title="Cancel time"></field> + <field name="canclAutmExtTimeUomId" title="Cancel UOM time"> <drop-down allow-empty="true"> <entity-options entity-name="Uom" key-field-name="uomId" description="${description}"> <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/SubscriptionScreens.xml Wed Aug 3 16:12:58 2011 @@ -77,19 +77,6 @@ under the License. <decorator-section name="left-column"> <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> </decorator-section> - <decorator-section name="pre-body"> - <section> - <condition> - <and> - <if-service-permission service-name="subscriptionPermissionCheck" main-action="VIEW"/> - <not><if-empty field="subscription"/></not> - </and> - </condition> - <widgets> - <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> - </widgets> - </section> - </decorator-section> <decorator-section name="body"> <section> <condition> @@ -101,11 +88,19 @@ under the License. <not><if-empty field="subscription"/></not> </condition> <widgets> - <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${subscription.description} [${subscriptionId}]</label></container> + <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> <container style="button-bar"><link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext"/></container> + <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${subscription.description} [${subscriptionId}]</label></container> </widgets> <fail-widgets> - <container style="h1"><label>${uiLabelMap[titleProperty]}</label></container> + <section> + <condition> + <if-compare operator="not-equals" value="EditSubscription" field="tabButtonItem"/> + </condition> + <widgets> + <container style="button-bar"><link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext"/></container> + </widgets> + </section> </fail-widgets> </section> <decorator-section-include name="body"/> @@ -137,7 +132,9 @@ under the License. </section> <decorator-screen name="CommonSubscriptionDecorator" location="${parameters.subscriptionDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/> + <screenlet id="editSubscription" title="${uiLabelMap.PageTitleEditSubscription}" collapsible="true"> + <include-form name="EditSubscription" location="component://product/widget/catalog/SubscriptionForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -177,7 +174,7 @@ under the License. <set field="titleProperty" value="PageTitleFindSubscriptionResource"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonSubscriptionResourceDecorator"> <decorator-section name="body"> <section> <condition> @@ -211,6 +208,9 @@ under the License. </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="left-column"> + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> + </decorator-section> <decorator-section name="body"> <section> <condition> @@ -223,13 +223,13 @@ under the License. </condition> <widgets> <include-menu name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionMenus.xml"/> - <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} "${subscriptionResource.description}" [${subscriptionResourceId}]</label></container> <container style="button-bar"> <link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/> <link target="FindSubscription" text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext"> <parameter param-name="subscriptionResourceId"/> </link> </container> + <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} "${subscriptionResource.description}" [${subscriptionResourceId}]</label></container> </widgets> <fail-widgets> <container style="h1"><label>${uiLabelMap[titleProperty]}</label></container> @@ -264,7 +264,9 @@ under the License. </section> <decorator-screen name="CommonSubscriptionResourceDecorator" location="${parameters.subscriptionResourceDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionForms.xml"/> + <screenlet id="EditSubscriptionResource" title="${uiLabelMap.PageTitleEditSubscriptionResource}" collapsible="true"> + <include-form name="EditSubscriptionResource" location="component://product/widget/catalog/SubscriptionForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityTrees.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityTrees.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityTrees.xml Wed Aug 3 16:12:58 2011 @@ -20,8 +20,7 @@ under the License. <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd"> - <tree name="FacilityTree" root-node-name="node-root" entity-name="Facility" expand-collapse-request="FacilityChildren?facilityId=${facilityId}" - default-render-style="expand-collapse"> + <tree name="FacilityTree" root-node-name="node-root" entity-name="Facility" default-render-style="expand-collapse"> <node name="node-root" render-style="simple"> <sub-node node-name="node-body"> <entity-and entity-name="Facility"> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/config/WorkEffortUiLabels.xml Wed Aug 3 16:12:58 2011 @@ -2010,6 +2010,10 @@ <value xml:lang="zh">å·²å建</value> <value xml:lang="zh_TW">å·²åµå»º</value> </property> + <property key="WorkEffortCreatedSuccessfully"> + <value xml:lang="en">Work Effort successfully created.</value> + <value xml:lang="it">Impegno di lavoro creato con successo.</value> + </property> <property key="WorkEffortCustomerRating"> <value xml:lang="de">Kundenbewertung</value> <value xml:lang="en">Customer Rating</value> @@ -3016,6 +3020,10 @@ <value xml:lang="zh">å®å ¨é误ï¼è¦è¿è¡${resourceDescription}ï¼ä½ å¿ é¡»ä»¥${roleTypeId}è§è²å人工æå¡ï¼${workEffortId}</value> <value xml:lang="zh_TW">å®å ¨é¯èª¤ï¼è¦éè¡${resourceDescription}ï¼ä½ å¿ é 以${roleTypeId}è§è²åå·¥é ï¼${workEffortId}</value> </property> + <property key="WorkEffortNoteCreatedSuccessfully"> + <value xml:lang="en">Note is successfully created.</value> + <value xml:lang="it">Nota è stato creata con successo.</value> + </property> <property key="WorkEffortNoteMissing"> <value xml:lang="de">Notiz fehlt</value> <value xml:lang="en">Note is missing</value> @@ -3214,7 +3222,7 @@ <value xml:lang="de">Phasenaufgaben</value> <value xml:lang="en">PhaseTasks</value> <value xml:lang="es">Tareas de fase</value> - <value xml:lang="fr">Phase des tâches</value> + <value xml:lang="fr">Tâches de la phase</value> <value xml:lang="it">Compiti della fase</value> <value xml:lang="nl">PhaseTasks</value> <value xml:lang="ro">Faze Sarcini</value> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Wed Aug 3 16:12:58 2011 @@ -90,6 +90,7 @@ under the License. <!-- update status of customer request --> <set field="updCustReq.custRequestId" from-field="parameters.custRequestId"/> <set field="updCustReq.statusId" value="CRQ_REVIEWED"/> + <set field="updCustReq.webSiteId" from-field="parameters.webSiteId"/> <call-service service-name="setCustRequestStatus" in-map-name="updCustReq"/> <entity-and list="custRequestContents" entity-name="CustRequestContent"> <field-map field-name="custRequestId" from-field="parameters.custRequestId"/> @@ -201,6 +202,7 @@ under the License. <remove-related value-field="lookedUpValue" relation-name="RuntimeData"/> <remove-related value-field="lookedUpValue" relation-name="WorkEffortPartyAssignment"/> <remove-related value-field="lookedUpValue" relation-name="WorkEffortFixedAssetAssign"/> + <remove-related value-field="lookedUpValue" relation-name="WorkEffortSkillStandard"/> <remove-related value-field="lookedUpValue" relation-name="WorkEffortStatus"/> <!-- Delete actual main entity last --> @@ -339,14 +341,14 @@ under the License. <if-not-empty field="parameters.partyId"> <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="context"/> <call-service service-name="createPartyContactMech" in-map-name="context"> - <default-message>Party Contact Mechanism successfully created.</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <log level="info" message="Party ContactMech created"/> <else> <set-service-fields service-name="createContactMech" map="parameters" to-map="context"/> <call-service service-name="createContactMech" in-map-name="context"> - <default-message>Contact Mechanism successfully created.</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <log level="info" message="ContactMech created"/> @@ -425,7 +427,7 @@ under the License. <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/PartyContactMechMapProcs.xml" processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> <call-service service-name="createPartyPostalAddress" in-map-name="context"> - <default-message>Party Contact Mechanism successfully created.</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <log level="info" message="Party ContactMech created"/> @@ -433,7 +435,7 @@ under the License. <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/ContactMechMapProcs.xml" processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="createPostalAddress"> - <default-message>Postal Address successfully created</default-message> + <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> </else> @@ -444,7 +446,7 @@ under the License. <set from-field="newValue.contactMechId" field="context2.contactMechId"/> <log level="info" message="Copied id to context2: ${context2.contactMechId}"/> <call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech"> - <default-message>WorkEffort Contact Mechanism successfully created</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> </call-service> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> <field-to-result field="newValue.contactMechId" result-name="contactMechId"/> @@ -455,7 +457,7 @@ under the License. <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/ContactMechMapProcs.xml" processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="updatePostalAddress"> - <default-message>Postal Address successfully updated</default-message> + <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <call-map-processor xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml" @@ -464,7 +466,7 @@ under the License. <set field="context2.contactMechTypeId" value="POSTAL_ADDRESS"/> <log level="info" message="Copied id to context2: ${context2.newContactMechId}"/> <call-service in-map-name="context2" service-name="updateWorkEffortContactMech"> - <default-message>WorkEffort Contact Mechanism successfully updated</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/> </call-service> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> <field-to-result field="newValue.contactMechId" result-name="contactMechId"/> @@ -477,7 +479,7 @@ under the License. <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/PartyContactMechMapProcs.xml" processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> <call-service service-name="createPartyTelecomNumber" in-map-name="context"> - <default-message>Party Contact Mechanism successfully created.</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> <log level="info" message="Party ContactMech created"/> @@ -485,7 +487,7 @@ under the License. <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/ContactMechMapProcs.xml" processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="createTelecomNumber"> - <default-message>Telecom number successfully created</default-message> + <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> </else> @@ -495,7 +497,7 @@ under the License. <set from-field="newValue.contactMechId" field="context2.contactMechId"/> <log level="info" message="Copied id to context2: ${context2.contactMechId}"/> <call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech"> - <default-message>WorkEffort Contact Mechanism successfully created</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> </call-service> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> <field-to-result field="newValue.contactMechId" result-name="contactMechId"/> @@ -506,7 +508,7 @@ under the License. <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/ContactMechMapProcs.xml" processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="updateTelecomNumber"> - <default-message>Telecom Number successfully updated</default-message> + <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> <result-to-field result-name="contactMechId" field="newValue.contactMechId"/> </call-service> @@ -516,7 +518,7 @@ under the License. <set field="context2.contactMechTypeId" value="TELECOM_NUMBER"/> <log level="info" message="Copied id to context2: ${context2.newContactMechId}"/> <call-service in-map-name="context2" service-name="updateWorkEffortContactMech"> - <default-message>Party Contact Mechanism successfully updated</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/> </call-service> <log level="info" message="Setting result id: ${newValue.contactMechId}"/> <field-to-request field="newValue.contactMechId" request-name="contactMechId"/> @@ -529,7 +531,7 @@ under the License. <check-errors/> <set field="cwecmMap.contactMechTypeId" value="EMAIL_ADDRESS"/> <call-service service-name="createWorkEffortContactMech" in-map-name="cwecmMap"> - <default-message>WorkEffort Contact Mechanism successfully created.</default-message> + <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/> <result-to-result result-name="contactMechId"/> <result-to-request result-name="contactMechId"/> </call-service> @@ -540,7 +542,7 @@ under the License. <check-errors/> <set field="uwecmMap.contactMechTypeId" value="EMAIL_ADDRESS"/> <call-service service-name="updateWorkEffortContactMech" in-map-name="uwecmMap"> - <default-message>WorkEffort Contact Mechanism successfully updated.</default-message> + <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/> <result-to-result result-name="contactMechId"/> <result-to-request result-name="contactMechId"/> </call-service> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowSimpleEvents.xml Wed Aug 3 16:12:58 2011 @@ -25,7 +25,8 @@ under the License. processor-name="assignmentMap" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="wfAcceptAssignment" in-map-name="context"> - <default-message>Work Effort successfully created.</default-message></call-service> + <default-message resource="WorkEffortUiLabels" property="WorkEffortCreatedSuccessfully"/> + </call-service> </simple-method> <simple-method method-name="acceptRoleAssignment" short-description="Accept a ROLE Assignment"> @@ -33,14 +34,15 @@ under the License. processor-name="assignmentMap" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="wfAcceptRoleAssignment" in-map-name="context"> - <default-message>Work Effort successfully created.</default-message></call-service> + <default-message resource="WorkEffortUiLabels" property="WorkEffortCreatedSuccessfully"/> + </call-service> </simple-method> <simple-method method-name="createWorkEffort" short-description="Creates WorkEffort"> <call-map-processor xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml" processor-name="createWorkEffortMap" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="createWorkEffort" in-map-name="context"> - <default-message>Work Effort successfully created.</default-message> + <default-message resource="WorkEffortUiLabels" property="WorkEffortCreatedSuccessfully"/> <result-to-request result-name="workEffortId"/> </call-service> </simple-method> @@ -52,7 +54,7 @@ under the License. processor-name="createWorkEffortAssocMap" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="createWorkEffortAndAssoc" in-map-name="context"> - <default-message>Work Effort successfully created.</default-message> + <default-message resource="WorkEffortUiLabels" property="WorkEffortCreatedSuccessfully"/> <result-to-request result-name="workEffortId"/> </call-service> </simple-method> @@ -61,7 +63,7 @@ under the License. processor-name="createWorkEffortNoteMap" in-map-name="parameters" out-map-name="context"/> <check-errors/> <call-service service-name="createWorkEffortNote" in-map-name="context"> - <default-message>Note is successfully created.</default-message> + <default-message resource="WorkEffortUiLabels" property="WorkEffortNoteCreatedSuccessfully"/> <result-to-request result-name="noteId"/> </call-service> </simple-method> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml Wed Aug 3 16:12:58 2011 @@ -48,6 +48,7 @@ under the License. <attribute name="requirementId" type="String" mode="IN" optional="true"/> <attribute name="custRequestId" type="String" mode="IN" optional="true"/> <attribute name="communicationEventId" type="String" mode="IN" optional="true"/> + <attribute name="webSiteId" type="String" mode="IN" optional="true"/><!-- for notification services --> <override name="workEffortTypeId" optional="false"/> <override name="workEffortName" optional="false"/> <override name="currentStatusId" optional="false"/> @@ -77,6 +78,7 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> <attribute name="communicationEventId" type="String" mode="IN" optional="true"/> <attribute name="reason" type="String" mode="IN" optional="true"/> + <attribute name="webSiteId" type="String" mode="IN" optional="true"/><!-- for notification services --> </service> <service name="deleteWorkEffort" default-entity-name="WorkEffort" engine="simple" location="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml" invoke="deleteWorkEffort"> @@ -191,22 +193,28 @@ under the License. </service> <service name="getWorkEffortAssignedTasks" engine="java" location="org.ofbiz.workeffort.workeffort.WorkEffortServices" invoke="getWorkEffortAssignedTasks"> - <description>Get WorkEffort Assigned Tasks</description> + <description>Get WorkEffort Assigned Tasks : workEffort assign to userLogin.partyId and with + workEffortTypeId = TASK and currentStatusId not in (CAL_DECLINED, CAL_DELEGATED, CAL_COMPLETED, CAL_CANCELLED) and partyAssign.statusId != PRTYASGN_UNASSIGNED + OR workEffortTypeId = PROD_ORDER_TASK and currentStatusId not in (PRUN_CANCELLED, PRUN_COMPLETED, PRUN_CLOSED)</description> <attribute name="tasks" type="java.util.List" mode="OUT" optional="false"/> </service> <service name="getWorkEffortAssignedActivities" engine="java" location="org.ofbiz.workeffort.workeffort.WorkEffortServices" invoke="getWorkEffortAssignedActivities"> - <description>Get WorkEffort Assigned Activities</description> + <description>Get WorkEffort Assigned Activities : workEffort assign to userLogin.partyId and with + workEffortTypeId = ACTIVITY and currentStatusId not in (WF_COMPLETED, WF_TERMINATED, WF_ABORTED) + and partyAssign.statusId not in (CAL_DECLINED, CAL_DELEGATED, CAL_COMPLETED, CAL_CANCELLED, PRTYASGN_UNASSIGNED)</description> <attribute name="activities" type="java.util.List" mode="OUT" optional="false"/> </service> <service name="getWorkEffortAssignedActivitiesByRole" engine="java" location="org.ofbiz.workeffort.workeffort.WorkEffortServices" invoke="getWorkEffortAssignedActivitiesByRole"> - <description>Get WorkEffort Assigned Activities By Role</description> + <description>Get WorkEffort Assigned Activities By Role : same condition as getWorkEffortAssignedActivities but on view WorkEffortPartyAssignByRole + to be able to have all party roles</description> <attribute name="roleActivities" type="java.util.List" mode="OUT" optional="false"/> </service> <service name="getWorkEffortAssignedActivitiesByGroup" engine="java" location="org.ofbiz.workeffort.workeffort.WorkEffortServices" invoke="getWorkEffortAssignedActivitiesByGroup"> - <description>Get WorkEffort Assigned Activities By Group</description> + <description>Get WorkEffort Assigned Activities By Group : same condition as getWorkEffortAssignedActivities but on view WorkEffortPartyAssignByGroup + to be able to have all parties associated to userLogin.partyId by PartyRelationship</description> <attribute name="groupActivities" type="java.util.List" mode="OUT" optional="false"/> </service> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Wed Aug 3 16:12:58 2011 @@ -622,15 +622,14 @@ public class WorkEffortServices { entityExprList.addAll(periodCheckAndlList); // (non cancelled) recurring events + /* Commenting this out. This condition adds ALL recurring events to ALL calendars. List<EntityCondition> recurringEvents = UtilMisc.<EntityCondition>toList(EntityCondition.makeCondition("tempExprId", EntityOperator.NOT_EQUAL, null)); if (filterOutCanceledEvents.booleanValue()) { recurringEvents.addAll(cancelledCheckAndList); } + */ - EntityCondition eclTotal = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND), - EntityCondition.makeCondition(recurringEvents, EntityJoinOperator.AND) - ), EntityJoinOperator.OR); + EntityCondition eclTotal = EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND); List<String> orderByList = UtilMisc.toList("estimatedStartDate"); try { @@ -669,7 +668,7 @@ public class WorkEffortServices { for (GenericValue workEffort : validWorkEfforts) { if (UtilValidate.isNotEmpty(workEffort.getString("tempExprId"))) { // check if either the workeffort is public or the requested party is a member - if (UtilValidate.isNotEmpty(partyIdsToUse) && !workEffort.getString("scopeEnumId").equals("WES_PUBLIC") && !partyIdsToUse.contains(workEffort.getString("partyId"))) { + if (UtilValidate.isNotEmpty(partyIdsToUse) && !"WES_PUBLIC".equals(workEffort.getString("scopeEnumId")) && !partyIdsToUse.contains(workEffort.getString("partyId"))) { continue; } TemporalExpression tempExpr = TemporalExpressionWorker.getTemporalExpression(delegator, workEffort.getString("tempExprId")); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |