svn commit: r1763754 - /ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1763754 - /ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl

jleroux@apache.org
Author: jleroux
Date: Fri Oct  7 12:17:50 2016
New Revision: 1763754

URL: http://svn.apache.org/viewvc?rev=1763754&view=rev
Log:
Fixed: cannot edit shopping list for ecommerce and ecomseo
(OFBIZ-8348)

This was previously fixed with r1763686 by Pawan Verma which was correct.
But Scott reported on dev ML that he was surprised by this bare solution.
We could have kept it because it's hiw js works, but since we use jQuery and for
 consistencey reason Amardeep suggested to rather
$('#selectShoppingList').submit()

This reverts and applies Amardeep's solution.

It also removes pending work related with OFBIZ-4106. I have asked a question
about it yesterday and forgot to remove the related change in this unrelated
commit.

Thanks: Scott for report, Amardeep for patch

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl?rev=1763754&r1=1763753&r2=1763754&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/template/shoppinglist/EditShoppingList.ftl Fri Oct  7 12:17:50 2016
@@ -103,8 +103,8 @@ under the License.
                     <option value="${list.shoppingListId}">${list.listName}</option>
                   </#list>
                 </select>
-                <a href="javascript:document.getElementById('selectShoppingList').submit();" class="button">${uiLabelMap.CommonEdit}</a>
-            </fieldset>
+                <a href="javascript:$('#selectShoppingList').submit();" class="button">${uiLabelMap.CommonEdit}</a>
+            </fieldset>  
           </form>
         <#else>
           <label>${uiLabelMap.EcommerceNoShoppingListsCreate}.</label>
@@ -249,12 +249,12 @@ under the License.
               <span>
                   <label>${uiLabelMap.CommonStartDate}</label>
                   <input type="text" class="textBox" name="startDateTime" size="22" value="${(recurrenceInfo.startDateTime)?if_exists}" />
-                  <@htmlTemplate.renderDateTimeField name="startDateTime" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceInfo.startDateTime)!}" size="25" maxlength="30" id="startDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                  <a href="javascript:call_cal(document.reorderinfo.startDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" alt="Calendar" /></a>
               </span>
               <span>
                 <label>${uiLabelMap.CommonEndDate}</label>
                 <input type="text" class="textBox" name="endDateTime" size="22" value="${(recurrenceRule.untilDateTime)?if_exists}">
-                <@htmlTemplate.renderDateTimeField name="endDateTime" className="textBox" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(recurrenceRule.untilDateTime)!}" size="25" maxlength="30" id="endDateTime1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+                <a href="javascript:call_cal(document.reorderinfo.endDateTime, '${nowTimestamp.toString()}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a>
               </span>
             </div>
             <div>