瀏覽代碼

Merge branch 'hotfix'

version-14
mbauskar 7 年之前
父節點
當前提交
ba38e945c1
共有 4 個檔案被更改,包括 5 行新增3 行删除
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/desk/reportview.py
  3. +2
    -1
      frappe/public/js/frappe/form/controls/date.js
  4. +1
    -0
      frappe/public/js/frappe/form/controls/datetime.js

+ 1
- 1
frappe/__init__.py 查看文件

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template

__version__ = '8.10.2'
__version__ = '8.10.3'
__title__ = "Frappe Framework"

local = Local()


+ 1
- 1
frappe/desk/reportview.py 查看文件

@@ -153,7 +153,7 @@ def export_query():
for r in data:
# encode only unicode type strings and not int, floats etc.
writer.writerow(map(lambda v: isinstance(v, string_types) and
handle_html(v.encode('utf-8')) or v, r))
handle_html(frappe.as_unicode(v)) or v, r))

f.seek(0)
frappe.response['result'] = text_type(f.read(), 'utf-8')


+ 2
- 1
frappe/public/js/frappe/form/controls/date.js 查看文件

@@ -16,7 +16,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
// if date is selected but different from value, refresh
const selected_date =
moment(this.datepicker.selectedDates[0])
.format(moment.defaultDateFormat);
.format(this.date_format);
should_refresh = selected_date !== value;
} else {
// if datepicker has no selected date, refresh
@@ -35,6 +35,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
lang = 'en';
}
this.today_text = __("Today");
this.date_format = moment.defaultDateFormat;
this.datepicker_options = {
language: lang,
autoClose: true,


+ 1
- 0
frappe/public/js/frappe/form/controls/datetime.js 查看文件

@@ -2,6 +2,7 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
set_date_options: function() {
this._super();
this.today_text = __("Now");
this.date_format = moment.defaultDatetimeFormat;
$.extend(this.datepicker_options, {
timepicker: true,
timeFormat: "hh:ii:ss",


Loading…
取消
儲存