details: https://code.openbravo.com/erp/devel/pi/rev/b53f23468fa9 changeset: 14862:b53f23468fa9 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue Dec 13 18:32:49 2011 +0100 summary: Fixed issue 19011. The encoding of the response has been set so that the file name is shown correctly
details: https://code.openbravo.com/erp/devel/pi/rev/9c987c6e8bc8 changeset: 14863:9c987c6e8bc8 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Tue Dec 13 19:08:33 2011 +0100 summary: Fixed issue 19228. OBScheduler will correctly parse all dates diffstat: src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 1 + src/org/openbravo/scheduling/OBScheduler.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diffs (32 lines): diff -r f22a1c536caf -r 9c987c6e8bc8 src/org/openbravo/erpCommon/businessUtility/TabAttachments.java --- a/src/org/openbravo/erpCommon/businessUtility/TabAttachments.java Tue Dec 13 18:52:27 2011 +0100 +++ b/src/org/openbravo/erpCommon/businessUtility/TabAttachments.java Tue Dec 13 19:08:33 2011 +0100 @@ -109,6 +109,7 @@ Tab tab = OBDal.getInstance().get(Tab.class, strTab); JSONObject obj = AttachmentsAH.getAttachmentJSONObject(tab, key); String buttonId = vars.getStringParameter("buttonId"); + response.setContentType("text/html; charset=UTF-8"); Writer writer = response.getWriter(); writer.write("<HTML><BODY><script type=\"text/javascript\">"); writer.write("top." + buttonId + ".callback(" + obj.toString() + ");"); diff -r f22a1c536caf -r 9c987c6e8bc8 src/org/openbravo/scheduling/OBScheduler.java --- a/src/org/openbravo/scheduling/OBScheduler.java Tue Dec 13 18:52:27 2011 +0100 +++ b/src/org/openbravo/scheduling/OBScheduler.java Tue Dec 13 19:08:33 2011 +0100 @@ -370,11 +370,15 @@ } else if (data.timingOption.equals(TIMING_OPTION_LATER)) { trigger = new SimpleTrigger(); - start = timestamp(data.startDate, data.startTime, dateTimeFormat); + Date date = new SimpleDateFormat("dd-MM-yyyy").parse(data.startDate); + start = timestamp(new SimpleDateFormat(dateTimeFormat).format(date), data.startTime, + dateTimeFormat); trigger.setStartTime(start.getTime()); } else if (data.timingOption.equals(TIMING_OPTION_SCHEDULED)) { - start = timestamp(data.startDate, data.startTime, dateTimeFormat); + Date date = new SimpleDateFormat("dd-MM-yyyy").parse(data.startDate); + start = timestamp(new SimpleDateFormat(dateTimeFormat).format(date), data.startTime, + dateTimeFormat); final int second = start.get(Calendar.SECOND); final int minute = start.get(Calendar.MINUTE); ------------------------------------------------------------------------------ Systems Optimization Self Assessment Improve efficiency and utilization of IT resources. Drive out cost and improve service delivery. Take 5 minutes to use this Systems Optimization Self Assessment. http://www.accelacomm.com/jaw/sdnl/114/51450054/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
