Author: ashish
Date: Wed Jan 12 10:45:00 2011
New Revision: 1058057
URL: http://svn.apache.org/viewvc?rev=1058057&view=rev
Log:
Minor bug fixes.
1. Changed 'uiLabel' to 'uiLabelMap'.
2. Added condition to avoid null pointer exception.
3. Fixed issue of JS function.
Thanks Arun!
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy?rev=1058057&r1=1058056&r2=1058057&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
Wed Jan 12 10:45:00 2011
@@ -48,7 +48,6 @@
contentPathPrefix = CatalogWorker.getContentPathPrefix(request);
productStoreId = parameters.productStoreId;
search_CategoryId = parameters.search_CategoryId;
-
//Get the addItemList and Prepare details
apiContext = EbayEvents.getApiContext(request);
addItemObj = EbayEvents.getAddItemListingObject(request, apiContext);
@@ -120,6 +119,7 @@
}
}
categorySpecificObject = EbayEvents.categorySpecifics(pkCateId,
request);
+ if(categorySpecificObject) {
Map<String, List> categorySpecificMap =
categorySpecificObject.get("categorySpecifics");
int checkNameSpecific = null;
int checkValueSpecific = null;
@@ -133,6 +133,7 @@
String checkSpecific = ((checkNameSpecific > 0) &&
(checkValueSpecific == 1)) ? "true" : "false";
context.checkSpecific = checkSpecific;
context.categorySpecifix = categorySpecificObject;
+ }
context.stCate1ID = stCate1ID;
context.stCate2ID = stCate2ID;
if (pkCateId) {
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl?rev=1058057&r1=1058056&r2=1058057&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
Wed Jan 12 10:45:00 2011
@@ -22,7 +22,7 @@ under the License.
if (areaName.value.length > limit){
areaName.value=areaName.value.substring(0,limit);
}else{
- charleft.innerHTML = (limit - areaName.value.length) + "
${uiLabel.CommonCharactorsLeft}";
+ charleft.innerHTML = (limit - areaName.value.length) + "
${uiLabelMap.CommonCharactorsLeft}";
}
}
function retrieveThemeColorSchemeByThemeId(url, themeId, productStoreId){
@@ -32,7 +32,7 @@ under the License.
url: url,
type: "GET",
data: pars,
- beforeStart: function() {document.getElementById('loading').innerHTML
= ' ${uiLabel.CommonPleaseWait}';},
+ beforeStart: function() {document.getElementById('loading').innerHTML
= ' ${uiLabelMap.CommonPleaseWait}';},
success: function(data) {
if (data != null){
var resp = eval("("+data+")");
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl?rev=1058057&r1=1058056&r2=1058057&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl
Wed Jan 12 10:45:00 2011
@@ -132,7 +132,7 @@ under the License.
<tr>
<td align="center" colspan="2">
<hr />
- <a
href="javascript:submit(document.getElementById('productSearchform'));"
class="buttontext">${uiLabelMap.CommonFind}</a>
+ <a href="javascript:submit('productSearchform');"
class="buttontext">${uiLabelMap.CommonFind}</a>
</td>
</tr>
</table>
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1058057&r1=1058056&r2=1058057&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
Wed Jan 12 10:45:00 2011
@@ -76,7 +76,9 @@ under the License.
url: url,
type: "GET",
data: pars,
- beforeStart:
function({document.getElementById('loading').innerHTML =
'<b>${uiLabel.CommonPleaseWait}</b>';}),
+ beforeStart: function() {
+ document.getElementById('loading').innerHTML =
'<b>${uiLabelMap.CommonPleaseWait}</b>';
+ },
success: function(data) {
document.getElementById('loading').innerHTML = '';
if(data != null){
@@ -85,7 +87,7 @@ under the License.
var leng = resp.size();
for (i=0;i<leng;i++) {
if (i == 0) {
- document.getElementById(id).options[0] = new
Option("${uiLabel.CommonPleaseSelect}","");
+ document.getElementById(id).options[0] = new
Option("${uiLabelMap.CommonPleaseSelect}","");
}
var optVal = resp[i].CategoryCode;
var optName = resp[i].CategoryName;
@@ -114,7 +116,7 @@ under the License.
var j = 0;
for (i=0;i<leng+1;i++) {
if (i == 0) {
- document.getElementById('theme').options[0] = new
Option("${uiLabel.CommonPleaseSelect}","_NA_");
+ document.getElementById('theme').options[0] = new
Option("${uiLabelMap.CommonPleaseSelect}","_NA_");
} else {
var optVal =
resp[i].TemplateId+":"+resp[i].TemplateImageURL;
document.getElementById('theme').options[i] = new
Option(resp[i].TemplateName,optVal);
