Commit 445fd4aa authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Update modules converters to add missing types in JSON_TYPES.

parent 2eddca63
......@@ -4,7 +4,7 @@
import gluon.dal
import re
from datetime import date, datetime, time
from extjs import (Base,
CheckBox,
ComboBox,
......@@ -29,6 +29,7 @@ from extjs import (Base,
Model,
PanelWithUrlSelector)
from gluon import current
from gluon.languages import lazyT
from gluon.storage import Storage
from gluon.tools import PluginManager
from gridmodifier import ROW_NUMBERING
......@@ -68,8 +69,24 @@ PAGE = 'page'
SUCCESS = 'success'
TOTAL = 'count'
# list of type which can be converted as a JSON string
JSON_TYPES = (bool, dict, float, int, list, long, str, tuple)
# types which can be converted as a JSON string using plugin_dbui.JSONEncoder:
#
# from plugin_dbui import JSONEncode
# s = json.dumps(foo, cls=JSONEncoder)
#
JSON_TYPES = (bool,
date,
datetime,
dict,
float,
int,
lazyT,
list,
long,
str,
time,
tuple,
unicode)
# xtype defining linked comboBoxes
X_LINKED_COMBO = ['xcomboboxmaster', 'xcomboboxslave']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment