Author: jleroux
Date: Fri Dec 2 05:39:25 2011
New Revision: 1209363
URL:
http://svn.apache.org/viewvc?rev=1209363&view=revLog:
"Applied fix from trunk for revision: 1209362"
------------------------------------------------------------------------
r1209362 | jleroux | 2011-12-02 06:37:17 +0100 (ven., 02 déc. 2011) | 3 lines
A patch from Leon
https://issues.apache.org/jira/browse/OFBIZ-4598 "set ACTIVATED_LOOKUP to null if there's no other lookup dialog open"
Set ACTIVATED_LOOKUP to null in lookup dialog "close" function when there's no other lookup dialog open, in case of some kind of wrong behavior during the opening process of a new lookup dialog.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/framework/images/webapp/images/fieldlookup.js
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 2 05:39:25 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1209250
+/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199,1180398,1181878,1182259,1182310,1182731,1182858,1183651,1184906,1184996,1184999,1185179,1187515,1187528,1187933,1187944,1188042,1188564,1189592,1189601,1190134,1194958,1196778,1199276,1199450,1200207,1201110,1201125,1201941,1203350,1203776,1206507,1206690,1209250,1209362
Modified: ofbiz/branches/release11.04/framework/images/webapp/images/fieldlookup.js
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/images/webapp/images/fieldlookup.js?rev=1209363&r1=1209362&r2=1209363&view=diff==============================================================================
--- ofbiz/branches/release11.04/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/branches/release11.04/framework/images/webapp/images/fieldlookup.js Fri Dec 2 05:39:25 2011
@@ -255,7 +255,7 @@ function ConstructLookup(requestUrl, inp
var requestUrlAndArgs = requestUrl;
if (typeof args == "object" && jQuery.isArray(args)) {
for (var i = 0; i < args.length; i++) {
- requestUrlAndArgs += "&parm" + i + "=" + jQuery(args[i]).val();
+ requestUrlAndArgs += "&parm" + i + "=" + jQuery(args[i]).val();
}
}
jQuery("#" + lookupId).load(requestUrlAndArgs, function(data){
@@ -286,6 +286,8 @@ function ConstructLookup(requestUrl, inp
}
if (prevLookup) {
identifyLookup(prevLookup);
+ } else {
+ ACTIVATED_LOOKUP = null;
}
}
Locked
