瀏覽代碼

Merge branch 'master' into develop

version-14
mbauskar 7 年之前
父節點
當前提交
6e746a72f7
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +5
    -1
      frappe/client.py

+ 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.3'
__version__ = '8.10.4'
__title__ = "Frappe Framework"

local = Local()


+ 5
- 1
frappe/client.py 查看文件

@@ -8,7 +8,7 @@ import frappe.model
import frappe.utils
import json, os

from six import iteritems, string_types
from six import iteritems, string_types, integer_types

'''
Handle RESTful requests that are mapped to the `/api/resource` route.
@@ -61,6 +61,10 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False):

try:
filters = json.loads(filters)

if isinstance(filters, (integer_types, float)):
filters = frappe.as_unicode(filters)

except (TypeError, ValueError):
# filters are not passesd, not json
pass


Loading…
取消
儲存