svn commit: r1305581 [21/36] - in /ofbiz/branches/20111205EmailH
Locked
svn commit: r1305581 [21/36] - in /ofbiz/branches/20111205EmailH
 
|
Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementForms.xml Mon Mar 26 20:56:02 2012 @@ -44,7 +44,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="${currentFormName}" description="${drDataResourceName}"> <parameter param-name="productId"/> @@ -106,7 +106,7 @@ under the License. </radio> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="checkStatusId" position="2" title="${uiLabelMap.CommonStatus}"> <radio no-current-selected-key="${checkRadio}"> <option key="IM_APPROVED/${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/> @@ -153,7 +153,7 @@ under the License. <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> @@ -193,7 +193,7 @@ under the License. <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> @@ -247,7 +247,7 @@ under the License. <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" position="2" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId" position="2"><display/></field> <field name="dataResourceId" position="2"><display/></field> @@ -305,7 +305,7 @@ under the License. <field name="dataResourceId"><hidden/></field> <field name="fromDate"><hidden/></field> <field name="_rowSubmit" title=" " widget-style="hidden"><check all-checked="true"/></field> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="action" use-when="${groovy: return context.drMimeTypeId == 'image/jpeg';}" title="${uiLabelMap.ImageManagementAction}" event="onChange" action="javascript: document.ListImageManage.action='checkAction?productId=${productId}&contentId=${contentId}&dataResourceId=${dataResourceId}'; document.ListImageManage.submit();"> @@ -362,7 +362,7 @@ under the License. </sort-order> </form> - <form name="showDefaultImage" type="single" title="" header-row-style="header-row" default-table-style="basic-table"> + <form name="ShowDefaultImage" type="single" title="" header-row-style="header-row" default-table-style="basic-table"> <actions> <entity-and entity-name="ProductContentAndInfo" list="productContentAndInfos"> <field-map field-name="productId" from-field="parameters.productId"/> @@ -381,7 +381,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </actions> - <field name="drObjectInfo" title=" "><image width="100"/></field> + <field name="drObjectInfo" title=" "><image style="cssImgLarge"/></field> </form> <form name="ImageFrames" type="single" title="" target="uploadFrame" header-row-style="header-row" default-table-style="basic-table" target-window="_self"> @@ -403,17 +403,17 @@ under the License. <field name="productId"><hidden value="${parameters.productId}"/></field> <field name="contentId"><hidden value="${parameters.contentId}"/></field> <field name="dataResourceId"><hidden value="${parameters.dataResourceId}"/></field> - <field name="frameContentId"><hidden value="${frameContentId}"></hidden></field> - <field name="frameDataResourceId"><hidden value="${frameDataResourceId}"></hidden></field> + <field name="frameContentId"><hidden value="${frameContentId}"/></field> + <field name="frameDataResourceId"><hidden value="${frameDataResourceId}"/></field> <field name="checkFrame"><hidden value="T"/></field> <field name="frameURL"><hidden value="${parameters.checkFrame}"/></field> <field name="imageName"><hidden value="${contentDataResource.drDataResourceName}"/></field> <field name="imageShare" use-when="imageURL != null" title="${uiLabelMap.CommonImage}" widget-area-style="image-src"><image value="${imageURL}"/></field> <field name="imageShare" use-when="imageURL == null" title="${uiLabelMap.CommonImage}"><image value="/images/defaultImage.jpg" width="200"/></field> - <field name="imageDimention" widget-area-style="dimention"><display></display></field> + <field name="imageDimension" widget-area-style="dimension"><display/></field> <field name="imageFrame" use-when="frameURL != null" title="${uiLabelMap.ImageManagementFrame}" widget-area-style="image-fr"><image value="${frameURL}"/></field> <field name="imageFrame" use-when="frameURL == null" title="${uiLabelMap.ImageManagementFrame}" widget-area-style="image-fr"><image value="/images/defaultImage.jpg" width="200"/></field> - <field name="frameDimention" use-when="frameURL != null" widget-area-style="frameDimention"><display></display></field> + <field name="frameDimension" use-when="frameURL != null" widget-area-style="frameDimension"><display/></field> <field name="uploadedFile" title="${uiLabelMap.ImageManagementUploadNewFrame}" event="onClick" action="javascript:setUploadTarget('_self');"><file/></field> <field name="uploadButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit" event="onClick" action="javascript:document.ImageFrames.setAttribute('enctype', 'multipart/form-data');setTargetWindows('upload');document.ImageFrames.submit();"><submit button-type="button"/></field> <field name="imageFrameContentId" title="${uiLabelMap.ImageManagementChooseExistFrame}"><lookup target-form-name="LookupImageFrame"/></field> @@ -424,7 +424,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonCreate}" use-when="frameURL != null" widget-style="smallSubmit" event="onClick" action="javascript:setTargetWindows('_self');"><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="buttontext" event="onClick" action="javascript:deletePreviewFrameImage();"> <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}"> - <parameter param-name="productId" from-field="parameters.productId"></parameter> + <parameter param-name="productId" from-field="parameters.productId"/> </hyperlink> </field> </form> @@ -451,7 +451,7 @@ under the License. <field name="imageName"><hidden value="${contentDataResource.drDataResourceName}"/></field> <field name="imageWatermark" use-when="imageURL != null" title="${uiLabelMap.CommonImage}" widget-area-style="img-src"><image value="${imageURL}"/></field> <field name="imageWatermark" use-when="imageURL == null" title="${uiLabelMap.CommonImage}" widget-area-style="img-src-de"><image value="/images/defaultImage.jpg"/></field> - <field name="" widget-style="h3"><display description="Click directly on the image to adjust the location of the watermark"></display></field> + <field name="" widget-style="h3"><display description="${uiLabelMap.ImageManagementWatermarkingLocation}"/></field> <field name="imageOpacity" title="${uiLabelMap.ImageManagementOpacity}" widget-area-style="opacity"> <drop-down no-current-selected-key="0.5"> <option key="0.1" description="10%"/> @@ -467,7 +467,7 @@ under the License. </drop-down> </field> <field name="textWatermark" title="${uiLabelMap.CommonText}" widget-area-style="watermark_txt"><text default-value="DEFAULT"/></field> - <field name="previewButton" title=" " widget-style="buttontext" widget-area-style="preview"><hyperlink target="#" target-type="plain" description="${uiLabelMap.CommonPreview}"></hyperlink></field> + <field name="previewButton" title=" " widget-style="buttontext" widget-area-style="preview"><hyperlink target="#" target-type="plain" description="${uiLabelMap.CommonPreview}"/></field> <field name="colorWatermark" title="${uiLabelMap.ImageManagementTextColor}" widget-area-style="txt_color"> <drop-down allow-empty="true" no-current-selected-key="TEXT_BLACK"> <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId"> @@ -486,10 +486,10 @@ under the License. </entity-options> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}" event="onClick" action="javascript:setImageDimention()" widget-style="smallSubmit" ><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" event="onClick" action="javascript:setImageDimension()" widget-style="smallSubmit" ><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="buttontext" event="onClick" action="javascript:deletePreviewWatermarkImage();"> <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}"> - <parameter param-name="productId" from-field="parameters.productId"></parameter> + <parameter param-name="productId" from-field="parameters.productId"/> </hyperlink> </field> </form> @@ -538,7 +538,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" position="1"><submit button-type="button"/></field> <field name="cancelButton" title=" " widget-style="buttontext"> <hyperlink target="ListImageManage" description="${uiLabelMap.CommonCancel}"> - <parameter param-name="productId" from-field="parameters.productId"></parameter> + <parameter param-name="productId" from-field="parameters.productId"/> </hyperlink> </field> </form> @@ -568,10 +568,10 @@ under the License. <field name="imageShare" use-when="imageURL == null" title="${uiLabelMap.CommonImage}"><image value="/images/defaultImage.jpg" width="200"/></field> <field name="link" title="${uiLabelMap.CommonLink}" event="onClick" action="javascript:select();"><text/></field> <field name="direct" title="${uiLabelMap.ImageManagementDirectLink}" event="onClick" action="javascript:select();"><text/></field> - <field name="forumCode" title="${uiLabelMap.ImageManagementForumCode}" event="onClick" action="javascript:select();"><text></text></field> - <field name="forumThumbnail" title="${uiLabelMap.ImageManagementForumThumbnail}" event="onClick" action="javascript:select();"><text></text></field> - <field name="altForumCode" title="${uiLabelMap.ImageManagementAltForumCode}" event="onClick" action="javascript:select();"><text></text></field> - <field name="altForumThumbnail" title="${uiLabelMap.ImageManagementAltForumThumbnail}" event="onClick" action="javascript:select();"><text></text></field> + <field name="forumCode" title="${uiLabelMap.ImageManagementForumCode}" event="onClick" action="javascript:select();"><text/></field> + <field name="forumThumbnail" title="${uiLabelMap.ImageManagementForumThumbnail}" event="onClick" action="javascript:select();"><text/></field> + <field name="altForumCode" title="${uiLabelMap.ImageManagementAltForumCode}" event="onClick" action="javascript:select();"><text/></field> + <field name="altForumThumbnail" title="${uiLabelMap.ImageManagementAltForumThumbnail}" event="onClick" action="javascript:select();"><text/></field> <field name="html" title="${uiLabelMap.ImageManagementHTMLCode}" event="onClick" action="javascript:select();"><text/></field> <field name="htmlThumbnail" title="${uiLabelMap.ImageManagementHTMLThumbnail}" event="onClick" action="javascript:select();"><text/></field> </form> @@ -605,7 +605,6 @@ under the License. <entity-condition entity-name="ProductContentAndInfo"> <condition-list combine="and"> <condition-expr field-name="productId" from-field="parameters.productId"/> - <condition-expr field-name="statusId" value="IM_PENDING"/> <condition-expr field-name="productContentTypeId" value="IMAGE"/> <condition-expr field-name="fromDate" operator="greater-equals" from-field="dateNow" /> </condition-list> @@ -623,7 +622,7 @@ under the License. <set field="drObjectInfo" from-field="contentDataResourceViews[0].drObjectInfo"/> </row-actions> <field name="productId"><hidden/></field> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="fromDate"><display/></field> <field name="status"><display description="Uploaded"/></field> @@ -661,7 +660,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/> </field> @@ -676,7 +675,7 @@ under the License. </field> </form> - <form name="productImageReplace" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageReplace"> + <form name="ProductImageReplace" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="ListImageReplace"> <field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -712,14 +711,14 @@ under the License. <set field="ApprovedBy" value="${userLoginAndPartyDetails[0].firstName} ${userLoginAndPartyDetails[0].middleName} ${userLoginAndPartyDetails[0].lastName}"/> </row-actions> <field name="productId"><hidden/></field> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"><display/></field> <field name="contentId"><display/></field> <field name="dataResourceId"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> - <field name="purchaseFromDate" title="${uiLabelMap.ImageManamentApprovedDate}"><display/></field> + <field name="purchaseFromDate" title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field> <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext"> <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/> </field> @@ -749,7 +748,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="ListImageReplace" description="${drDataResourceName}"> <parameter param-name="productId"/> @@ -790,7 +789,7 @@ under the License. <field-map field-name="contentId"/> </entity-and> </row-actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}"> <hyperlink target="ListImageReplace" description="${drDataResourceName}"> <parameter param-name="productId"/> @@ -815,7 +814,7 @@ under the License. <condition-expr field-name="contentTypeId" value="IMAGE_FRAME"/> </entity-condition> </actions> - <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image width="100"/></field> + <field name="drObjectInfo" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> <field name="drDataResourceName" title="${uiLabelMap.ImageManagementImageName}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${drDataResourceName}" target="javascript:set_value('${contentId}')"/> </field> @@ -829,13 +828,19 @@ under the License. </field>--> </form> - <form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeAllImageOfProduct"> + <form name="ImageResize" type="single" title="" header-row-style="header-row" default-table-style="basic-table" target="resizeImages"> + <field name="resizeOption"> + <drop-down > + <option key="resizeAllImages" description="Resize All Images"/> + <option key="createNewThumbnail" description="Create New Thumbnail Size"/> + </drop-down> + </field> <field name="productId" title="${uiLabelMap.ImageManagementChooseProductID}"><lookup target-form-name="LookupProduct"/></field> <field name="size" title="${uiLabelMap.ImageManagementImageWidth}"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="sizeListOfProduct" type="list" title="" odd-row-style="alternate-row" default-table-style="basic-table" use-row-submit="true" separate-columns="true"> + <form name="SizeListOfProduct" type="list" title="" odd-row-style="alternate-row" default-table-style="basic-table" use-row-submit="true" separate-columns="true"> <actions> <entity-condition entity-name="ContentAssoc"> <condition-list combine="and"> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ImageManagementScreens.xml Mon Mar 26 20:56:02 2012 @@ -23,8 +23,7 @@ under the License. <screen name="Imagemanagement"> <section> <actions> - <set field="headerItem" value="Imagemanagement"/><!-- this highlights the selected menu-item with name "main" --> - <set field="userTabButtonMainAppBar" value="Imagemanagement"/> + <set field="userTabButtonImage" value="main"/> </actions> <widgets> <decorator-screen name="ImageManagementDecorator" location="${parameters.mainDecoratorLocation}"> @@ -223,7 +222,7 @@ under the License. <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/showPeopleApprove.ftl"/></html> </platform-specific> - <screenlet title="${uiLabelMap.ImageManamentApprove}"> + <screenlet title="${uiLabelMap.ImageManagementApprove}"> <include-form name="ImageApprove" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> @@ -436,7 +435,7 @@ under the License. <include-form name="ListImageManage" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ImageManagementDefaultImage}"> - <include-form name="showDefaultImage" location="component://product/widget/catalog/ImageManagementForms.xml"/> + <include-form name="ShowDefaultImage" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -658,7 +657,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ImageManagementReplace}"> - <include-form name="productImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/> + <include-form name="ProductImageReplace" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -757,7 +756,7 @@ under the License. <screen name="ViewImage"> <section> <widgets> - <image src="${parameters.drObjectInfo}"></image> + <image src="${parameters.drObjectInfo}"/> <platform-specific> <html><html-template location="component://product/webapp/catalog/imagemanagement/ResizeImage.ftl"/></html> </platform-specific> @@ -771,7 +770,7 @@ under the License. <property-to-field resource="catalog" property="image.management.url" field="imageServerUrl"/> </actions> <widgets> - <image src="${imageServerUrl}/preview/previewImage.jpg"></image> + <image src="${imageServerUrl}/preview/previewImage.jpg"/> </widgets> </section> </screen> @@ -884,8 +883,8 @@ under the License. </condition> <widgets> <!--<label style="h1">${uiLabelMap.Product} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label>--> - <screenlet title="Size Existing In Product : ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]"> - <include-form name="sizeListOfProduct" location="component://product/widget/catalog/ImageManagementForms.xml"/> + <screenlet title="${uiLabelMap.ImageManagementThumbnailSizeExistingInProduct} : ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]"> + <include-form name="SizeListOfProduct" location="component://product/widget/catalog/ImageManagementForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ImageManagementResize}"> <include-form name="ImageResize" location="component://product/widget/catalog/ImageManagementForms.xml"/> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductForms.xml Mon Mar 26 20:56:02 2012 @@ -1951,13 +1951,59 @@ under the License. <auto-fields-service service-name="createProductKeyword"/> <field name="productId"><hidden/></field> <field name="relevancyWeight"><text default-value="1"/></field> + <field name="keywordTypeId"> + <drop-down> + <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> + <entity-constraint name="enumTypeId" operator="equals" value="KEYWORD_TYPE"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="statusId"> + <drop-down allow-empty="true"> + <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"> + <entity-constraint name="statusTypeId" value="KEYWORD_STATUS"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> - <form name="UpdateProductKeyword" type="list" target="deleteProductKeyword" title="" list-name="productKeywords" + <form name="UpdateProductKeyword" type="list" target="updateProductKeyword" title="" list-name="" odd-row-style="alternate-row" default-table-style="basic-table"> - <auto-fields-entity entity-name="ProductKeyword" default-field-type="display"/> + <actions> + <entity-condition entity-name="ProductKeyword"> + <condition-list combine="and"> + <condition-expr field-name="productId" operator="equals" from-field="productId"/> + <condition-expr field-name="keywordTypeId" operator="equals" from-field="keywordTypeId"/> + </condition-list> + <order-by field-name="statusId"/> + <order-by field-name="-relevancyWeight"/> + <order-by field-name="keyword"/> + </entity-condition> + </actions> <field name="productId"><hidden/></field> - <field name="submitButton" title="${uiLabelMap.CommonDelete}"><submit button-type="button"/></field> + <field name="keyword"><display/></field> + <field name="keywordTypeId" title="${uiLabelMap.FormFieldTitle_keywordType}"> + <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/> + </field> + <field name="relevancyWeight"><display/></field> + <field name="statusId"> + <drop-down allow-empty="true"> + <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"> + <entity-constraint name="statusTypeId" value="KEYWORD_STATUS"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink target="deleteProductKeyword" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="productId"/> + <parameter param-name="keyword"/> + <parameter param-name="keywordTypeId"/> + </hyperlink> + </field> </form> <!-- ProductAttribute --> <form name="AddProductAttribute" type="single" target="createProductAttribute" title="" @@ -2058,7 +2104,7 @@ under the License. <form name="ListBestProduct" type="list" paginate="false" list-name="bestSellingProducts" view-size="5" header-row-style="header-row" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="productName" title="${uiLabelMap.ProductName}"><display description="${productName}"/></field> - <field name="amount"><display/></field> + <field name="amount"><display type="currency"/></field> <field name="qtyOrdered" title="${uiLabelMap.OrderQtyOrdered}"><display/></field> </form> @@ -2153,4 +2199,35 @@ under the License. <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}*"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + + <form name="ListProductTag" type="multi" target="updateProductTag" title="" list-name="" + odd-row-style="alternate-row" default-table-style="basic-table" paginate-target="EditProductTag" separate-columns="true"> + <actions> + <entity-condition entity-name="ProductKeyword"> + <condition-list combine="and"> + <condition-expr field-name="keywordTypeId" operator="equals" value="KWT_TAG"/> + <condition-expr field-name="statusId" operator="equals" value="KW_PENDING"/> + </condition-list> + <order-by field-name="productId"/> + <order-by field-name="keyword"/> + </entity-condition> + </actions> + <field name="keywordTypeId"><hidden/></field> + <field name="productId"> + <hyperlink target="EditProduct" description="${productId}"> + <parameter param-name="productId"/> + </hyperlink> + </field> + <field name="keyword" title="${uiLabelMap.ProductTag}"><display/></field> + <field name="statusId"> + <drop-down allow-empty="true"> + <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}"> + <entity-constraint name="statusTypeId" value="KEYWORD_STATUS"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + </form> </forms> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductScreens.xml Mon Mar 26 20:56:02 2012 @@ -64,7 +64,7 @@ under the License. <widgets> <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}"/> + <image src="${product.smallImageUrl}" url-mode="content" alt="${product.internalName}" style="cssImgSmall"/> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}] ${${extraFunctionName}}</label> </widgets> <fail-widgets> @@ -621,9 +621,9 @@ under the License. <set field="labelTitleProperty" value="ProductKeywords"/> <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <set field="orderByList[]" value="-relevancyWeight"/> - <set field="orderByList[]" value="keyword"/> - <get-related value-field="product" relation-name="ProductKeyword" list="productKeywords" order-by-list="orderByList"/> + <entity-and entity-name="Enumeration" list="keywordTypeList"> + <field-map field-name="enumTypeId" value="KEYWORD_TYPE"/> + </entity-and> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -639,9 +639,18 @@ under the License. <screenlet title="${uiLabelMap.ProductAddProductKeyword}"> <include-form name="AddProductKeyword" location="component://product/widget/catalog/ProductForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.PageTitleEditProductKeywords}"> - <include-form name="UpdateProductKeyword" location="component://product/widget/catalog/ProductForms.xml"/> - </screenlet> + <iterate-section entry="keywordType" list="keywordTypeList"> + <section> + <actions> + <set field="keywordTypeId" from-field="keywordType.enumId"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.PageTitleEditProductKeywords} : ${keywordType.description}"> + <include-form name="UpdateProductKeyword" location="component://product/widget/catalog/ProductForms.xml"/> + </screenlet> + </widgets> + </section> + </iterate-section> </decorator-section> </decorator-screen> </widgets> @@ -1431,4 +1440,18 @@ under the License. </widgets> </section> </screen> + + <screen name="EditProductTag"> + <section> + <widgets> + <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.PageTitleEditProductTags}"> + <include-form name="ListProductTag" location="component://product/widget/catalog/ProductForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/ProductStoreForms.xml Mon Mar 26 20:56:02 2012 @@ -53,7 +53,7 @@ </entity-options> </drop-down> </field> - <field name="storeName" title="${uiLabelMap.ProductStoreName}"><text size="30" maxlength="60"/></field> + <field name="storeName" title="${uiLabelMap.ProductStoreName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field> <field name="title" title="${uiLabelMap.ProductTitle}"><text size="30" maxlength="60"/></field> <field name="subtitle" title="${uiLabelMap.ProductSubTitle}"><text size="60" maxlength="250"/></field> <field name="payToPartyId"><lookup target-form-name="LookupPartyName"/></field> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/catalog/StoreScreens.xml Mon Mar 26 20:56:02 2012 @@ -586,51 +586,23 @@ under the License. </screen> <!-- Assoc with product --> - <screen name="ProductStoreFacilities"> + <screen name="ListProductStoreFacility"> <section> <actions> <set field="titleProperty" value="ProductStoreFacilityAssocList"/> - <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreFacilities"/> <set field="productStoreId" from-field="parameters.productStoreId"/> + <set field="portalPageId" value="ProductStoreFacility"/> </actions> <widgets> - <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-portal-page id="ProductStoreFacility"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="ListProductStoreFacility"> - <section> - <widgets> + <container id="ProductStoreFacilityEditArea"/> <screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}" navigation-menu-name="ProductStoreFacility"> <include-menu name="ProductStoreFacility" location="component://product/widget/catalog/CatalogMenus.xml"/> - <container id="PrdStoreFacilityMgmtArea"> - <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="ListProductStoreFacilityFormOnly"/> - </decorator-section> - </decorator-screen> - </container> + <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> </screenlet> </widgets> </section> </screen> - <screen name="ListProductStoreFacilityFormOnly"> - <section> - <actions> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <container id="ProductStoreFacilityEditArea"/> - <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> - </widgets> - </section> - </screen> <screen name="EditProductStoreFacility"> <section> <condition> Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityMenus.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityMenus.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityMenus.xml Mon Mar 26 20:56:02 2012 @@ -40,7 +40,6 @@ under the License. <parameter param-name="facilityId"/> </link> </menu-item> - <menu-item name="tracking" title="${uiLabelMap.Tracking}"><link target="Tracking"/></menu-item> </menu> <menu name="FacilityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" Modified: ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/product/widget/facility/FacilityScreens.xml Mon Mar 26 20:56:02 2012 @@ -176,14 +176,16 @@ under the License. <not><if-empty field="facilityId"/></not> </condition> <widgets> - <container style="button-bar"> - <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/> - <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" style="buttontext" url-mode="inter-app"> + <container style="page-title"> + <label>${uiLabelMap.ProductEditFacility} ${facility.facilityName} [${facilityId}]</label> + </container> + <container style="button-bar button-style-1"> + <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/> + <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" url-mode="inter-app"> <parameter param-name="facilityId"/> <parameter param-name="externalLoginKey" from-field="parameters.externalLoginKey"/> </link> </container> - <label style="h1">${uiLabelMap.ProductEditFacility} ${facility.facilityName} [${facilityId}]</label> <platform-specific><html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html></platform-specific> </widgets> </section> @@ -221,17 +223,19 @@ under the License. <screen name="FacilityChildren"> <section> <actions> - <set field="titleProperty" value="ProductFacilityChildren"/> - <set field="headerItem" value="facility"/> - <set field="tabButtonItem" value="FacilityChildren"/> - <set field="facilityId" from-field="parameters.facilityId"/> - <set field="trail" from-field="parameters.trail" default-value="${facilityId}"/> + <set field="titleProperty" value="ProductFacilityChildren" /> + <set field="headerItem" value="facility" /> + <set field="tabButtonItem" value="FacilityChildren" /> + <set field="facilityId" from-field="parameters.facilityId" /> + <set field="trail" from-field="parameters.trail" default-value="${facilityId}" /> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container style="h1"><label text="${uiLabelMap.ProductFacilityChildren}"/></container> - <include-tree location="component://product/widget/facility/FacilityTrees.xml" name="FacilityTree"/> + <container style="page-title"> + <label text="${uiLabelMap.ProductFacilityChildren}" /> + </container> + <include-tree location="component://product/widget/facility/FacilityTrees.xml" name="FacilityTree" /> </decorator-section> </decorator-screen> </widgets> @@ -562,11 +566,11 @@ under the License. <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container> - <label style="h1">${uiLabelMap.ProductInventoryItemsDetailsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> + <container style="page-title"> + <label>${uiLabelMap.ProductInventoryItemsDetailsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label> </container> - <container style="button-bar"> - <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/> + <container style="button-bar button-style-1"> + <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/> </container> <screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}"> <include-form name="SearchInventoryItemsDetailsParams" location="component://product/widget/facility/FacilityForms.xml"/> @@ -725,11 +729,11 @@ under the License. <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container style="h1"> + <container style="page-title"> <label>${title}</label> </container> - <container style="button-bar"> - <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/> + <container style="button-bar button-style-1"> + <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/> </container> <screenlet id="add-facility-group-member" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true"> <include-form name="addGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/> @@ -759,11 +763,11 @@ under the License. <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <container style="h1"> + <container style="page-title"> <label>${title}</label> </container> - <container style="button-bar"> - <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/> + <container style="button-bar button-style-1"> + <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/> </container> <screenlet id="add-facility-party-role" title="${uiLabelMap.ProductAddFacilityPartyRole}" collapsible="true"> <include-form name="AddPartyToFacility" location="component://product/widget/facility/FacilityForms.xml"/> @@ -788,15 +792,17 @@ under the License. <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> - <label style="h1">${title}</label> - <container style="button-bar"> - <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/> + <container style="page-title"> + <label>${title}</label> + </container> + <container style="button-bar button-style-1"> + <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/> <section> <condition> <not><if-empty field="facilityId"/></not> </condition> <widgets> - <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" style="buttontext" url-mode="inter-app"> + <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" url-mode="inter-app"> <parameter param-name="period" value="month"/> <parameter param-name="facilityId"/> <parameter param-name="externalLoginKey"/> @@ -806,7 +812,7 @@ under the License. <if-service-permission service-name="facilityGenericPermission" main-action="CREATE"/> </condition> <widgets> - <link target="EditContactMech" text="${uiLabelMap.ProductNewContactMech}" style="buttontext create"> + <link target="EditContactMech" text="${uiLabelMap.ProductNewContactMech}" style="create"> <parameter param-name="facilityId"/> </link> </widgets> @@ -1529,7 +1535,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleFacilityGeoLocation} - ${facility.facilityName}"/> </actions> <widgets> - <decorator-screen name="CommonFacilityDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> <decorator-section name="body"> <container style="page-title"><label text="${title}"/></container> <screenlet id="edit-facility-geopoint" title="${uiLabelMap.ProductEditFacilityGeoLocation}" collapsible="true" initially-collapsed="true"> Modified: ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java Mon Mar 26 20:56:02 2012 @@ -91,7 +91,7 @@ public class TruitionCoReg { tru.setPath(cookiePath); tru.setMaxAge(time); resp.addCookie(tru); - Debug.log("Set Truition Cookie [" + tru.getName() + "/" + tru.getDomain() + " @ " + tru.getPath() + "] - " + tru.getValue(), module); + Debug.logInfo("Set Truition Cookie [" + tru.getName() + "/" + tru.getDomain() + " @ " + tru.getPath() + "] - " + tru.getValue(), module); } catch (UnsupportedEncodingException e) { Debug.logError(e, module); return "error"; @@ -119,7 +119,7 @@ public class TruitionCoReg { if (cookieName.equals(cookies[i].getName())) { cookies[i].setMaxAge(0); resp.addCookie(cookies[i]); - Debug.log("Set truition cookie [" + cookieName + " to expire now.", module); + Debug.logInfo("Set truition cookie [" + cookieName + " to expire now.", module); } } } @@ -131,7 +131,7 @@ public class TruitionCoReg { // redirect URL form field String redirectUrlName = UtilProperties.getPropertyValue("truition.properties", "truition.redirect.urlName"); String redirectUrl = req.getParameter(redirectUrlName); - Debug.log("Redirect to : " + redirectUrl, module); + Debug.logInfo("Redirect to : " + redirectUrl, module); if (truitionEnabled() && redirectUrl != null) { try { resp.sendRedirect(redirectUrl); @@ -141,7 +141,7 @@ public class TruitionCoReg { return "error"; } - Debug.log("Sending truition redirect - " + redirectUrl, module); + Debug.logInfo("Sending truition redirect - " + redirectUrl, module); return "redirect"; } return "success"; @@ -164,9 +164,9 @@ public class TruitionCoReg { String nickName = userLogin.getString("userLoginId"); String password = userLogin.getString("currentPassword"); String partyId = userLogin.getString("partyId"); - Debug.log(logPrefix + "nickName: " + nickName, module); - Debug.log(logPrefix + "password: " + password, module); - Debug.log(logPrefix + "partyId: " + partyId, module); + Debug.logInfo(logPrefix + "nickName: " + nickName, module); + Debug.logInfo(logPrefix + "password: " + password, module); + Debug.logInfo(logPrefix + "partyId: " + partyId, module); GenericValue party = null; try { @@ -196,9 +196,9 @@ public class TruitionCoReg { title = ""; } } - Debug.log(logPrefix + "title: " + title, module); - Debug.log(logPrefix + "firstName: " + firstName, module); - Debug.log(logPrefix + "lastName: " + lastName, module); + Debug.logInfo(logPrefix + "title: " + title, module); + Debug.logInfo(logPrefix + "firstName: " + firstName, module); + Debug.logInfo(logPrefix + "lastName: " + lastName, module); // email address String emailAddress = null; @@ -214,7 +214,7 @@ public class TruitionCoReg { } else { emailAddress = ""; } - Debug.log(logPrefix + "emailAddress: " + emailAddress, module); + Debug.logInfo(logPrefix + "emailAddress: " + emailAddress, module); // shipping address String address1 = null; @@ -250,12 +250,12 @@ public class TruitionCoReg { } } } - Debug.log(logPrefix + "address1: " + address1, module); - Debug.log(logPrefix + "address2: " + address2, module); - Debug.log(logPrefix + "city: " + city, module); - Debug.log(logPrefix + "state: " + state, module); - Debug.log(logPrefix + "zipCode: " + zipCode, module); - Debug.log(logPrefix + "country: " + country, module); + Debug.logInfo(logPrefix + "address1: " + address1, module); + Debug.logInfo(logPrefix + "address2: " + address2, module); + Debug.logInfo(logPrefix + "city: " + city, module); + Debug.logInfo(logPrefix + "state: " + state, module); + Debug.logInfo(logPrefix + "zipCode: " + zipCode, module); + Debug.logInfo(logPrefix + "country: " + country, module); // phone number String phoneNumber = null; @@ -290,7 +290,7 @@ public class TruitionCoReg { } } } - Debug.log(logPrefix + "phoneNumber: " + phoneNumber, module); + Debug.logInfo(logPrefix + "phoneNumber: " + phoneNumber, module); int retCode = -1; Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/config/WorkEffortUiLabels.xml Mon Mar 26 20:56:02 2012 @@ -91,7 +91,7 @@ <property key="FormFieldTitle_approvedByUserLoginId"> <value xml:lang="de">Genehmigt von Benutzer ID</value> <value xml:lang="en">Approved By User Login Id</value> - <value xml:lang="fr">Approuvé par la réf. d'utilisateur de connexion</value> + <value xml:lang="fr">Approuvé par</value> <value xml:lang="it">Approvato dall'utente</value> <value xml:lang="zh">æ¹åè ç¨æ·ç»å½æ è¯</value> <value xml:lang="zh_TW">æ ¸å使ç¨è ç»å ¥ID</value> @@ -378,14 +378,14 @@ </property> <property key="FormFieldTitle_reminderOffset"> <value xml:lang="en">Reminder Offset</value> - <value xml:lang="fr">Récurrence de décalage</value> + <value xml:lang="fr">Décalage 1er rappel</value> <value xml:lang="it">Intervallo promemoria</value> <value xml:lang="zh">æéå移é</value> </property> <property key="FormFieldTitle_repeatInterval"> <value xml:lang="de">Wiederholungsintervall</value> <value xml:lang="en">Repeat Interval</value> - <value xml:lang="fr">Répéter intervalle</value> + <value xml:lang="fr">Intervalle de répétition</value> <value xml:lang="it">Ripeti intervallo</value> <value xml:lang="zh">éå¤é´é</value> <value xml:lang="zh_TW">éè¤éé</value> @@ -1325,7 +1325,7 @@ <property key="PageTitleListWorkEffortTimeEntries"> <value xml:lang="en">Work Effort Time Entries</value> <value xml:lang="es">Entradas de tiempo</value> - <value xml:lang="fr">Planifications horaires de la tâche</value> + <value xml:lang="fr">Détails des temps passés sur la tâche</value> <value xml:lang="it">Pianificazione oraria dell'impegno di lavoro</value> <value xml:lang="nl">Activiteit Time Entries</value> <value xml:lang="ro">Introducere Sarcina de Lucru Timp</value> @@ -4135,6 +4135,7 @@ </property> <property key="WorkEffortTimesheetAlreadyExists"> <value xml:lang="en">Time sheet already exist, not created an other one.</value> + <value xml:lang="fr">La feuille d'activité existe déjà , pas de nouvelle création.</value> <value xml:lang="it">Timbratura già esistente, non crearne un'altra.</value> <value xml:lang="zh">å·²ç»åå¨æ¶é´è¡¨ï¼ä¸è½å建ä¸ä¸ªã</value> </property> Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortDemoData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortDemoData.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortDemoData.xml Mon Mar 26 20:56:02 2012 @@ -26,7 +26,12 @@ under the License. <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING" currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0" scopeEnumId="WES_PUBLIC" workEffortName="Staff Meeting" description="Staff Meeting" tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/> <FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead Projector" fixedAssetTypeId="EQUIPMENT" purchaseCost="2000" purchaseCostUomId="USD"/> <WorkEffortFixedAssetAssign workEffortId="STAFF_MTG" fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED" availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/> - + + <Party partyId="WorkEffortUser" partyTypeId="PERSON" statusId="PARTY_ENABLED" /> + <Person partyId="WorkEffortUser" firstName="WorkEffort" lastName="User" /> + <UserLogin userLoginId="WorkEffortUser" partyId="WorkEffortUser" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" /> + <UserLoginSecurityGroup groupId="WORKEFFORT_USER" userLoginId="WorkEffortUser" fromDate="2011-01-01 00:00:00.0" /> + <!-- Publish the staff meeting calendar event in iCalendar format --> <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/> <WorkEffortPartyAssignment workEffortId="CALENDAR_PUB_DEMO" partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" fromDate="2008-01-01 00:00:00.0"/> Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortTypeData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortTypeData.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/data/WorkEffortTypeData.xml Mon Mar 26 20:56:02 2012 @@ -40,6 +40,7 @@ under the License. <EnumerationType description="Calendar Type" enumTypeId="CALENDAR_TYPE" hasTable="N" parentTypeId=""/> <Enumeration description="Personal Calendar" enumCode="PERSONAL" enumId="CAL_PERSONAL" sequenceId="01" enumTypeId="CALENDAR_TYPE"/> <Enumeration description="Manufacturing Calendar" enumCode="MANUFACTURING" enumId="CAL_MANUFACTURING" sequenceId="02" enumTypeId="CALENDAR_TYPE"/> + <Enumeration description="None" enumId="CAL_NONE" sequenceId="03" enumTypeId="CALENDAR_TYPE"/> <!-- workeffort status --> <StatusType description="WorkEffort Asset" hasTable="N" parentTypeId="" statusTypeId="WORK_EFF_ASSET_STTS"/> Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/script/isCalOwner.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/script/isCalOwner.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/script/isCalOwner.groovy (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/script/isCalOwner.groovy Mon Mar 26 20:56:02 2012 @@ -17,16 +17,15 @@ * under the License. */ - +import java.util.*; import org.ofbiz.entity.util.*; - -partyAssign = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : parameters.workEffortId, "partyId" : parameters.userLogin.partyId])); - -if (partyAssign) { - if (partyAssign.get(0).roleTypeId.equals("CAL_OWNER")) { - context.isCalOwner = new Boolean(true); - } else{ - context.isCalOwner = new Boolean(false); +boolean isCalOwner = false; +List partyAssignments = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : parameters.workEffortId, "partyId" : parameters.userLogin.partyId])); +for (partyAssign in partyAssignments) { + if ("CAL_OWNER".equals(partyAssign.roleTypeId) || "CAL_DELEGATE".equals(partyAssign.roleTypeId)) { + isCalOwner = true; + break; } } +context.isCalOwner = isCalOwner; Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Mon Mar 26 20:56:02 2012 @@ -26,9 +26,16 @@ under the License. <call-service service-name="createWorkEffort" in-map-name="create"> <result-to-field result-name="workEffortId"/> </call-service> - <set-service-fields service-name="assignPartyToWorkEffort" map="parameters" to-map="assign"/> - <set field="assign.workEffortId" from-field="workEffortId"/> - <call-service service-name="assignPartyToWorkEffort" in-map-name="assign"/> + <check-errors /> + <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/> + <set-pk-fields map="parameters" value-field="newEntity"/> + <set-nonpk-fields map="parameters" value-field="newEntity"/> + <set field="newEntity.workEffortId" from-field="workEffortId"/> + <if-empty field="newEntity.fromDate"> + <now-timestamp field="newEntity.fromDate"/> + </if-empty> + <set field="newEntity.assignedByUserLoginId" from-field="userLogin.userLoginId"/> + <create-value value-field="newEntity"/> <field-to-result field="workEffortId"/> </simple-method> @@ -1655,6 +1662,7 @@ under the License. <condition-list combine="and"> <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/> <condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/> + <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> <condition-expr field-name="partyId" from-field="assignedParty.partyId"/> </condition-list> </entity-condition> @@ -1668,15 +1676,20 @@ under the License. <condition-list combine="and"> <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/> <condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/> + <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> <condition-expr field-name="fixedAssetId" from-field="assignedFixedAsset.fixedAssetId"/> </condition-list> </entity-condition> <list-to-list list="resultList" to-list="workEfforts"/> </iterate> - <entity-and list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true"> - <field-map field-name="workEffortIdFrom" from-field="workEffortId"/> - </entity-and> + <entity-condition list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true"> + <condition-list combine="and"> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> + <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> + </condition-list> + </entity-condition> <list-to-list list="resultList" to-list="workEfforts"/> + <set field="workEfforts" from-field="groovy:org.ofbiz.workeffort.workeffort.WorkEffortWorker.removeDuplicateWorkEfforts(workEfforts);" type="List"/> <field-to-result field="workEfforts"/> </simple-method> Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/servicedef/services.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/servicedef/services.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/servicedef/services.xml Mon Mar 26 20:56:02 2012 @@ -266,7 +266,10 @@ under the License. If filterOutCanceledEvents is set to Boolean(true) then workEfforts with currentStatusId=EVENT_CANCELLED will not be returned. To limit the events to a particular partyId, specify the partyId. To limit the events to a set of partyIds, specify a Collection of partyIds. </description> - <attribute name="calendarType" type="String" mode="IN" optional="true"/> + <attribute name="calendarType" type="String" mode="IN" optional="true"> + <description>Can be either CAL_PERSONAL or CAL_MANUFACTURING, defaults to CAL_PERSONAL. The value controls the type of work efforts + returned. To bypass this behavior, use an invalid value (like VOID).</description> + </attribute> <attribute name="partyId" type="String" mode="IN" optional="true"/> <attribute name="partyIds" type="java.util.Collection" mode="IN" optional="true"/> <attribute name="facilityId" type="String" mode="IN" optional="true"/> @@ -763,6 +766,7 @@ under the License. <description>Get iCalendar Work Efforts</description> <!-- No permission checking - the servlet handles that --> <attribute type="String" mode="IN" name="workEffortId" optional="false"/> + <attribute type="String" mode="IN" name="workEffortTypeId" optional="true"/> <attribute type="List" mode="OUT" name="workEfforts"/> </service> <service name="getPartyICalUrl" engine="simple" auth="false" Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Mon Mar 26 20:56:02 2012 @@ -69,7 +69,7 @@ public class WorkEffortKeywordIndex { if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1"))) { List<GenericValue> workEffortNotes = delegator.findByAnd("WorkEffortNoteAndData", UtilMisc.toMap("workEffortId", workEffortId)); - for (GenericValue workEffortNote : workEffortNotes) { + for (GenericValue workEffortNote : workEffortNotes) { addWeightedKeywordSourceString(workEffortNote, "noteInfo", strings); } } Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Mon Mar 26 20:56:02 2012 @@ -483,7 +483,7 @@ public class WorkEffortSearch { // ====================================================================== @SuppressWarnings("serial") - public static abstract class WorkEffortSearchConstraint implements java.io.Serializable { + public static abstract class WorkEffortSearchConstraint implements java.io.Serializable { public WorkEffortSearchConstraint() { } public abstract void addConstraint(WorkEffortSearchContext workEffortSearchContext); @@ -493,7 +493,7 @@ public class WorkEffortSearch { @SuppressWarnings("serial") - public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint { + public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint { public static final String constraintName = "WorkEffortAssoc"; protected String workEffortId; protected String workEffortAssocTypeId; @@ -809,7 +809,7 @@ public class WorkEffortSearch { } @SuppressWarnings("serial") - public static class ProductSetConstraint extends WorkEffortSearchConstraint { + public static class ProductSetConstraint extends WorkEffortSearchConstraint { public static final String constraintName = "ProductSet"; protected Set<String> productIdSet; Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Mon Mar 26 20:56:02 2012 @@ -43,7 +43,7 @@ public class WorkEffortSearchSession { public static final String module = WorkEffortSearchSession.class.getName(); @SuppressWarnings("serial") - public static class WorkEffortSearchOptions implements java.io.Serializable { + public static class WorkEffortSearchOptions implements java.io.Serializable { protected List<WorkEffortSearchConstraint> constraintList = null; protected ResultSortOrder resultSortOrder = null; protected Integer viewIndex = null; Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Mon Mar 26 20:56:02 2012 @@ -508,13 +508,15 @@ public class WorkEffortServices { String calendarType = (String) context.get("calendarType"); if (UtilValidate.isEmpty(calendarType)) { + // This is a bad idea. This causes the service to return only those work efforts that are assigned + // to the current user even when the service parameters have nothing to do with the current user. calendarType = "CAL_PERSONAL"; } String partyId = (String) context.get("partyId"); Collection<String> partyIds = UtilGenerics.checkCollection(context.get("partyIds")); String facilityId = (String) context.get("facilityId"); String fixedAssetId = (String) context.get("fixedAssetId"); - // Debug.log("======by period for fixedAsset: " + fixedAssetId + " facilityId: " + facilityId + "partyId: " + partyId + " entityExprList:" + (List) context.get("entityExprList")); + // Debug.logInfo("======by period for fixedAsset: " + fixedAssetId + " facilityId: " + facilityId + "partyId: " + partyId + " entityExprList:" + (List) context.get("entityExprList")); String workEffortTypeId = (String) context.get("workEffortTypeId"); Boolean filterOutCanceledEvents = (Boolean) context.get("filterOutCanceledEvents"); if (filterOutCanceledEvents == null) { @@ -536,7 +538,9 @@ public class WorkEffortServices { } // get a timestamp (date) for the beginning of today and for beginning of numDays+1 days from now - Timestamp startStamp = UtilDateTime.getDayStart(startDay, timeZone, locale); + // Commenting this out because it interferes with periods that do not start at the beginning of the day + // Timestamp startStamp = UtilDateTime.getDayStart(startDay, timeZone, locale); + Timestamp startStamp = startDay; Timestamp endStamp = UtilDateTime.adjustTimestamp(startStamp, periodType, 1, timeZone, locale); long periodLen = endStamp.getTime() - startStamp.getTime(); endStamp = UtilDateTime.adjustTimestamp(startStamp, periodType, numPeriods, timeZone, locale); @@ -635,7 +639,7 @@ public class WorkEffortServices { try { List<GenericValue> tempWorkEfforts = null; if (UtilValidate.isNotEmpty(partyIdsToUse)) { - // Debug.log("=====conditions for party: " + eclTotal); + // Debug.logInfo("=====conditions for party: " + eclTotal); tempWorkEfforts = EntityUtil.filterByDate(delegator.findList("WorkEffortAndPartyAssignAndType", eclTotal, null, orderByList, null, false)); } else { tempWorkEfforts = delegator.findList("WorkEffort", eclTotal, null, orderByList, null, false); @@ -721,6 +725,9 @@ public class WorkEffortServices { calEntry.put("workEffort", workEffort); long length = ((weRange.end().after(endStamp) ? endStamp.getTime() : weRange.end().getTime()) - (weRange.start().before(startStamp) ? startStamp.getTime() : weRange.start().getTime())); int periodSpan = (int) Math.ceil((double) length / periodLen); + if (length % periodLen == 0 && startDate.getTime() > periodRange.start().getTime()) { + periodSpan++; + } calEntry.put("periodSpan", Integer.valueOf(periodSpan)); DateRange calEntryRange = new DateRange((weRange.start().before(startStamp) ? startStamp : weRange.start()), (weRange.end().after(endStamp) ? endStamp : weRange.end())); calEntry.put("calEntryRange", calEntryRange); Modified: ofbiz/branches/20111205EmailHandling/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy (original) +++ ofbiz/branches/20111205EmailHandling/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy Mon Mar 26 20:56:02 2012 @@ -17,60 +17,18 @@ * under the License. */ -facilityId = parameters.facilityId; -fixedAssetId = parameters.fixedAssetId; -partyId = parameters.partyId; -workEffortTypeId = parameters.workEffortTypeId; -calendarType = parameters.calendarType; -hideEvents = parameters.hideEvents; +import java.util.*; +import org.ofbiz.base.util.*; -urlParam = ""; -if (facilityId) { - urlParam = "facilityId=" + facilityId; +// Allow containing screens to specify URL parameters to be included in calendar navigation links +List urlParameterNames = context.urlParameterNames; +if (urlParameterNames == null) { + urlParameterNames = UtilMisc.toList("fixedAssetId", "partyId", "workEffortTypeId", "calendarType", "hideEvents", "portalPageId"); } -if (fixedAssetId) { - if (urlParam) { - urlParam = urlParam + "&"; +StringBuilder sb = new StringBuilder(); +for (entry in parameters.entrySet()) { + if (urlParameterNames.contains(entry.getKey())) { + sb.append("&").append(entry.getKey()).append("=").append(entry.getValue()); } - urlParam = urlParam + "fixedAssetId=" + fixedAssetId; } -if (partyId) { - if (urlParam) { - urlParam = urlParam + "&"; - } - urlParam = urlParam + "partyId=" + partyId; -} - -if (workEffortTypeId) { - if (urlParam) { - urlParam = urlParam + "&"; - } - urlParam = urlParam + "workEffortTypeId=" + workEffortTypeId; -} - -if (calendarType) { - if (urlParam) { - urlParam = urlParam + "&"; - } - urlParam = urlParam + "calendarType=" + calendarType; -} - -if (hideEvents) { - if (urlParam) { - urlParam = urlParam + "&"; - } - urlParam = urlParam + "hideEvents=" + hideEvents; -} - -if (parameters.portalPageId) { - if (urlParam) { - urlParam = urlParam + "&"; - } - urlParam = urlParam + "portalPageId=" + parameters.portalPageId; -} - -if (urlParam) { - urlParam = "&" + urlParam; -} - -context.put("urlParam", urlParam); +context.put("urlParam", sb.toString()); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |