some sqlhtml renaming

This commit is contained in:
mdipierro
2015-12-27 07:12:56 -06:00
parent 2a7a4a3d04
commit 71fba07e3a
2 changed files with 8 additions and 7 deletions
+7 -6
View File
@@ -1504,13 +1504,12 @@ class SQLFORM(FORM):
hideerror=hideerror, hideerror=hideerror,
**kwargs **kwargs
) )
self.deleted = \ self.deleted = request_vars.get(self.FIELDNAME_REQUEST_DELETE, False)
request_vars.get(self.FIELDNAME_REQUEST_DELETE, False)
self.custom.end = CAT(self.hidden_fields(), self.custom.end) 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: if self.record_changed and self.detect_record_change:
message_onchange = \ message_onchange = \
@@ -1522,8 +1521,9 @@ class SQLFORM(FORM):
if message_onchange is not None: if message_onchange is not None:
current.response.flash = message_onchange current.response.flash = message_onchange
return ret 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 # that does not pass validation, yet it should be deleted
for fieldname in self.fields: for fieldname in self.fields:
@@ -1720,6 +1720,7 @@ class SQLFORM(FORM):
self.id_field_name]).update(**fields) self.id_field_name]).update(**fields)
else: else:
self.vars.id = self.table.insert(**fields) self.vars.id = self.table.insert(**fields)
self.accepted = ret self.accepted = ret
return ret return ret
+1 -1
View File
@@ -511,7 +511,7 @@ class IS_IN_DB(Validator):
_and=None, _and=None,
left=None, left=None,
delimiter=None, delimiter=None,
auto_add = False, auto_add=False,
): ):
from pydal.objects import Table from pydal.objects import Table
if hasattr(dbset, 'define_table'): if hasattr(dbset, 'define_table'):