Author: jleroux
Date: Thu Mar 15 11:33:59 2018
New Revision: 1826798
URL: http://svn.apache.org/viewvc?rev=1826798&view=rev
Log:
"Applied fix from trunk for revision: 1826797"
------------------------------------------------------------------------
r1826797 | jleroux | Thu Mar 15 11:29:59 2018 | 5 lines
Fixed: The getJSONuiLabel javascript function is no longer working
(OFBIZ-10277)
The data were well retrieve, but the syntax used to extract them was not working
------------------------------------------------------------------------
Modified:
ofbiz/branches/release16.11/framework/images/webapp/images/OfbizUtil.js
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/util/OfbizUtil.js
Modified:
ofbiz/branches/release16.11/framework/images/webapp/images/OfbizUtil.js
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/images/webapp/images/OfbizUtil.js?rev=1826798&r1=1826797&r2=1826798&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/images/webapp/images/OfbizUtil.js
(original)
+++ ofbiz/branches/release16.11/framework/images/webapp/images/OfbizUtil.js Thu
Mar 15 11:33:59 2018
@@ -947,11 +947,11 @@ function getJSONuiLabel(uiResource, errU
type: "POST",
data: {"requiredLabel" : requiredLabelStr},
success: function(data) {
- returnVal = data[0];
+ returnVal = data;
}
});
}
- return returnVal;
+ return returnVal[arguments[0]];
}
/**
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/util/OfbizUtil.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/util/OfbizUtil.js?rev=1826798&r1=1826797&r2=1826798&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/util/OfbizUtil.js
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/util/OfbizUtil.js
Thu Mar 15 11:33:59 2018
@@ -1057,11 +1057,11 @@ function getJSONuiLabel(uiResource, errU
type: "POST",
data: {"requiredLabel" : requiredLabelStr},
success: function(data) {
- returnVal = data[0];
+ returnVal = data;
}
});
}
- return returnVal;
+ return returnVal[arguments[0]];
}
/**
