svn commit: r742014 - in /ofbiz/trunk/applications: ecommerce/webapp/ecommerce/WEB
Locked
 
|
Author: jonesde
Date: Sun Feb 8 07:44:20 2009 New Revision: 742014 URL: http://svn.apache.org/viewvc?rev=742014&view=rev Log: A few cleanups plus a couple of fixes for problems caused by the new html encoding from screen widget included files Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditPerson.groovy ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/minipoll.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditPerson.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditPerson.groovy?rev=742014&r1=742013&r2=742014&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditPerson.groovy (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditPerson.groovy Sun Feb 8 07:44:20 2009 @@ -20,11 +20,6 @@ import java.util.HashMap; import org.ofbiz.base.util.UtilHttp; -person = null; -if (userLogin) { - person = userLogin.getRelatedOne("Person"); -} - tryEntity = true; errorMessage = parameters._ERROR_MESSAGE_; if (errorMessage) { @@ -34,8 +29,4 @@ if (!tryEntity) personData = UtilHttp.getParameterMap(request); if (!personData) personData = [:]; -donePage = parameters.DONE_PAGE ?: "viewprofile"; - -context.person = person; context.personData = personData; -context.donePage = donePage; Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/minipoll.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/minipoll.ftl?rev=742014&r1=742013&r2=742014&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/minipoll.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/minipoll.ftl Sun Feb 8 07:44:20 2009 @@ -29,7 +29,7 @@ </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>minipoll<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" style="margin: 0;"> - ${randomSurvey.render().toString()} + ${randomSurvey.render()} </form> </div> </div> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl?rev=742014&r1=742013&r2=742014&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl Sun Feb 8 07:44:20 2009 @@ -37,7 +37,6 @@ <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/> </#list> </#if> - ${layoutSettings?if_exists.extraHead?if_exists} <#-- Append CSS for catalog --> <#if catalogStyleSheet?exists> @@ -85,8 +84,8 @@ <#if (productStore.subtitle)?exists><div id="company-subtitle">${productStore.subtitle}</div></#if> <div id="welcome-message"> <#if sessionAttributes.autoName?has_content> - ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName}! - (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>) + ${uiLabelMap.CommonWelcome} ${sessionAttributes.autoName?html}! + (${uiLabelMap.CommonNotYou}? <a href="<@ofbizUrl>autoLogout</@ofbizUrl>" class="linktext">${uiLabelMap.CommonClickHere}</a>) <#else/> ${uiLabelMap.CommonWelcome}! </#if> Modified: ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml?rev=742014&r1=742013&r2=742014&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/CommonScreens.xml Sun Feb 8 07:44:20 2009 @@ -47,13 +47,13 @@ <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/> - <set field="layoutSettings.extraHead" value="<link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/>" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> <!-- The default (main) stylesheets --> <set field="layoutSettings.styleSheets[+0]" value="/ecommerce/images/blog.css" global="true"/> <set field="layoutSettings.styleSheets[+0]" value="${productStore.styleSheet}" default-value="/images/ecommain.css" global="true"/> <set field="layoutSettings.styleSheets[+0]" value="/images/prototypejs/popup.css" global="true"/> + <set field="layoutSettings.styleSheets[]" value="/content/images/contentForum.css" global="true"/> </actions> <widgets> <!-- render header --> Modified: ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?rev=742014&r1=742013&r2=742014&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Sun Feb 8 07:44:20 2009 @@ -158,6 +158,8 @@ <section> <actions> <set field="titleProperty" value="PageTitleEditPerson"/> + <get-related-one value-field="userLogin" relation-name="Person" to-value-field="person"/> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewprofile"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditPerson.groovy"/> </actions> <widgets> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=742014&r1=742013&r2=742014&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Sun Feb 8 07:44:20 2009 @@ -853,7 +853,7 @@ String idToFind, String goodIdentificationTypeId, boolean searchProductFirst, boolean searchAllId) throws GenericEntityException { - if (Debug.infoOn()) Debug.logInfo("Analyze goodIdentification: entered id = " + idToFind + ", goodIdentificationTypeId = " + goodIdentificationTypeId, module); + if (Debug.verboseOn()) Debug.logVerbose("Analyze goodIdentification: entered id = " + idToFind + ", goodIdentificationTypeId = " + goodIdentificationTypeId, module); GenericValue product = null; List<GenericValue> productsFound = null; @@ -880,7 +880,7 @@ if (UtilValidate.isNotEmpty(productsFound)) productsFound.add(product); else productsFound = UtilMisc.toList(product); } - if (Debug.infoOn()) Debug.logInfo("Analyze goodIdentification: found product.productId = " + product + ", and list : " + productsFound, module); + if (Debug.verboseOn()) Debug.logVerbose("Analyze goodIdentification: found product.productId = " + product + ", and list : " + productsFound, module); return productsFound; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |