Author: jleroux
Date: Sat Dec 8 16:03:57 2007
New Revision: 602587
URL: http://svn.apache.org/viewvc?rev=602587&view=rev
Log:
Applied fix from trunk for revision: 602586
Modified:
ofbiz/branches/release4.0/framework/common/webcommon/includes/lookup.ftl
ofbiz/branches/release4.0/framework/images/webapp/images/calendar.html
ofbiz/branches/release4.0/framework/images/webapp/images/fieldlookup.js
Modified:
ofbiz/branches/release4.0/framework/common/webcommon/includes/lookup.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/common/webcommon/includes/lookup.ftl?rev=602587&r1=602586&r2=602587&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/common/webcommon/includes/lookup.ftl
(original)
+++ ofbiz/branches/release4.0/framework/common/webcommon/includes/lookup.ftl
Sat Dec 8 16:03:57 2007
@@ -39,8 +39,8 @@
// function passing selected value to calling window
function set_value(value) {
if (!obj_caller) return;
- window.close();
obj_caller.target.value = value;
+ window.close();
}
// function passing selected value to calling window
function set_values(value, value2) {
Modified: ofbiz/branches/release4.0/framework/images/webapp/images/calendar.html
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/images/webapp/images/calendar.html?rev=602587&r1=602586&r2=602587&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/images/webapp/images/calendar.html
(original)
+++ ofbiz/branches/release4.0/framework/images/webapp/images/calendar.html Sat
Dec 8 16:03:57 2007
@@ -83,11 +83,11 @@
if (!dt_datetime) return;
if (b_close) {
- window.close();
obj_caller.target.value = (document.cal
? obj_caller.gen_tsmp(dt_datetime)
: obj_caller.gen_date(dt_datetime)
);
+ window.close();
}
else obj_caller.popup(dt_datetime.valueOf());
}
@@ -157,4 +157,5 @@
</table>
</body>
</html>
+
Modified:
ofbiz/branches/release4.0/framework/images/webapp/images/fieldlookup.js
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/images/webapp/images/fieldlookup.js?rev=602587&r1=602586&r2=602587&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/images/webapp/images/fieldlookup.js
(original)
+++ ofbiz/branches/release4.0/framework/images/webapp/images/fieldlookup.js Sat
Dec 8 16:03:57 2007
@@ -79,7 +79,7 @@
}
function lookup_popup1 (view_name, form_name, viewWidth, viewheight) {
- var obj_lookupwindow = window.open(view_name + '?formName=' + form_name
+ '&id=' + this.id,'FieldLookup',
'width='+viewWidth+',height='+viewheight+',scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ var obj_lookupwindow = window.open(view_name + '?formName=' + form_name
+ '&id=' + this.id,'_blank',
'width='+viewWidth+',height='+viewheight+',scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
obj_lookupwindow.opener = window;
obj_lookupwindow.focus();
}
@@ -96,7 +96,7 @@
if (view_name.indexOf("?") >= 0) {
sep = "&";
}
- var obj_lookupwindow = window.open(view_name + sep + 'id=' + this.id +
argString,'FieldLookup',
'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ var obj_lookupwindow = window.open(view_name + sep + 'id=' + this.id +
argString,'_blank',
'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
obj_lookupwindow.opener = window;
obj_lookupwindow.focus();
}
@@ -104,4 +104,5 @@
alert (str_message);
return null;
}
+
