Merge branch 'hotfix'
This commit is contained in:
commit
80b0aadb19
2 changed files with 6 additions and 2 deletions
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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…
Add table
Reference in a new issue