From 71fba07e3ad65fe34fde5934dd4ab853306eeadb Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 27 Dec 2015 07:12:56 -0600 Subject: [PATCH] some sqlhtml renaming --- gluon/sqlhtml.py | 13 +++++++------ gluon/validators.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 2ff8d32a..cff80b93 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1504,13 +1504,12 @@ class SQLFORM(FORM): hideerror=hideerror, **kwargs ) - - self.deleted = \ - request_vars.get(self.FIELDNAME_REQUEST_DELETE, False) + + self.deleted = request_vars.get(self.FIELDNAME_REQUEST_DELETE, False) self.custom.end = CAT(self.hidden_fields(), self.custom.end) - auch = self.record_id and self.errors and self.deleted + delete_exception = self.record_id and self.errors and self.deleted if self.record_changed and self.detect_record_change: message_onchange = \ @@ -1522,8 +1521,9 @@ class SQLFORM(FORM): if message_onchange is not None: current.response.flash = message_onchange return ret - elif (not ret) and (not auch): - # auch is true when user tries to delete a record + + elif (not ret) and (not delete_exception): + # delete_exception is true when user tries to delete a record # that does not pass validation, yet it should be deleted for fieldname in self.fields: @@ -1720,6 +1720,7 @@ class SQLFORM(FORM): self.id_field_name]).update(**fields) else: self.vars.id = self.table.insert(**fields) + self.accepted = ret return ret diff --git a/gluon/validators.py b/gluon/validators.py index 309c0aef..d5b41442 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -511,7 +511,7 @@ class IS_IN_DB(Validator): _and=None, left=None, delimiter=None, - auto_add = False, + auto_add=False, ): from pydal.objects import Table if hasattr(dbset, 'define_table'):