svn commit: r1060236 - in /ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find: EbayAdvancedSearch.ftl productsExportToEbay.ftl

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

svn commit: r1060236 - in /ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find: EbayAdvancedSearch.ftl productsExportToEbay.ftl

jleroux@apache.org
Author: jleroux
Date: Tue Jan 18 08:28:58 2011
New Revision: 1060236

URL: http://svn.apache.org/viewvc?rev=1060236&view=rev
Log:
A patch from Arun Patidar "Some misc issues in ebay component." (https://issues.apache.org/jira/browse/OFBIZ-4118) - OFBIZ-4118

JS is blocking during Export Product to ebay from ebay component.

Modified:
    ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
    ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl?rev=1060236&r1=1060235&r2=1060236&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl Tue Jan 18 08:28:58 2011
@@ -377,7 +377,7 @@ under the License.
           <tr>
             <td align="center" colspan="2">
               <hr />
-              <a href="javascript:submit(document.getElementById('advToKeywordSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a>
+              <a href="javascript:submit('advToKeywordSearchform');" class="buttontext">${uiLabelMap.CommonFind}</a>
             </td>
           </tr>
         </table>

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=1060236&r1=1060235&r2=1060236&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl Tue Jan 18 08:28:58 2011
@@ -30,11 +30,13 @@ under the License.
 
      function activateSubmitButton() {
          categ = document.forms["ProductsExportToEbay"].ebayCategory.value;
-         if (categ != null && (categ.substring(0, 1) == 'Y' || categ == '')) {
-             document.forms["ProductsExportToEbay"].submitButton.disabled = false;
-         } else {
-             document.forms["ProductsExportToEbay"].submitButton.disabled = true;
-             document.forms["ProductsExportToEbay"].submitButton.value = "Please select a category";
+         if (document.forms["ProductsExportToEbay"].submitButton) {
+             if (categ != null && (categ.substring(0, 1) == 'Y' || categ == '')) {
+                 document.forms["ProductsExportToEbay"].submitButton.disabled = false;
+             } else {
+                 document.forms["ProductsExportToEbay"].submitButton.disabled = true;
+                 document.forms["ProductsExportToEbay"].submitButton.value = "Please select a category";
+             }
          }
     }
 </script>
@@ -57,7 +59,7 @@ under the License.
                     </select>
                 </td>
             </tr>
-            <#if hideExportOptions == "N">
+            <#if hideExportOptions?has_content && hideExportOptions == "N">
             <tr>
                 <td align="right" class="label">${uiLabelMap.CommonCountry}</td>
                 <td>&nbsp;</td>