From bcc4ae2ec6533ca94b2cfeb67696f08c1823789f Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 8 Mar 2016 17:22:02 -0600 Subject: [PATCH] remporarily addressing issue #1203, thanks Simone --- fabfile.py | 2 +- gluon/packages/dal | 2 +- gluon/validators.py | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fabfile.py b/fabfile.py index 07574bd1..5226c530 100644 --- a/fabfile.py +++ b/fabfile.py @@ -98,7 +98,7 @@ def git_deploy(appname, repo): with cd(applications): sudo('git clone git@github.com/%s %s' % (repo, name)) sudo('chown -R www-data:www-data %s' % name) - + def retrieve(appname=None): """fab -H username@host retrieve:appname""" appname = appname or os.path.split(os.getcwd())[-1] diff --git a/gluon/packages/dal b/gluon/packages/dal index 0515e3b3..4b37722a 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit 0515e3b392532075a4de818429189e8daac59ea4 +Subproject commit 4b37722a227490d2249ba1a4648fb89498566158 diff --git a/gluon/validators.py b/gluon/validators.py index 1ca9ee49..427be9c5 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -633,12 +633,11 @@ class IS_IN_DB(Validator): if self.field.type in ('id','integer'): new_values = [] for value in values: - if isinstance(value,(int,long)) or value.isdigit(): - value = int(value) - elif self.auto_add: - value = self.maybe_add(table, self.fieldnames[0], value) - else: - return (values, translate(self.error_message)) + if not (isinstance(value,(int,long)) or value.isdigit()): + if self.auto_add: + value = str(self.maybe_add(table, self.fieldnames[0], value)) + else: + return (values, translate(self.error_message)) new_values.append(value) values = new_values