Merge branch 'develop'
This commit is contained in:
commit
e25225151a
2 changed files with 5 additions and 1 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"base_template": "lib/website/templates/base.html",
|
||||
"framework_version": "3.7.3",
|
||||
"framework_version": "3.7.4",
|
||||
"modules": {
|
||||
"Calendar": {
|
||||
"color": "#2980b9",
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ class DocListController(object):
|
|||
elif df.fieldtype in ("Int", "Check"):
|
||||
val1 = cint(val1)
|
||||
val2 = cint(val2)
|
||||
elif df.fieldtype in ("Data", "Text", "Small Text", "Long Text",
|
||||
"Text Editor", "Select", "Link"):
|
||||
val1 = cstr(val1)
|
||||
val2 = cstr(val2)
|
||||
|
||||
if not webnotes.compare(val1, condition, val2):
|
||||
msg = _("Error") + ": "
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue