dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

is active is not a parameter

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-04-05 20:28:34 -05:00
parent 1edbe9e340
commit 0ea268012b
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.7 (2012-04-05 20:19:10) dev Version 1.99.7 (2012-04-05 20:28:05) dev
gluon/dal.py
+10 -10
View File
@@ -6950,19 +6950,19 @@ class Table(dict):
def _archive_records(self, def _archive_records(self,
archive_db=None, archive_db=None,
archive_name = '%(tablename)_archive', archive_name = '%(tablename)_archive',
current_record = 'current_record'): current_record = 'current_record',
is_active = 'is_active'):
archive_db = archive_db or self._db archive_db = archive_db or self._db
fieldnames = self.fields() fieldnames = self.fields()
archive_name = archive_name % dict(tablename=self._tablename) archive_name = archive_name % dict(tablename=self._tablename)
if 'modified_by' in fieldnames and 'modified_on' in fieldnames: archive_table = archive_db.define_table(
archive_table = archive_db.define_table( archive_name,
archive_name, Field(current_record,self),
Field(current_record,self), self)
self) self._before_update.append(
self._before_update.append( lambda qset,fs,at=archive_table,cn=current_record:
lambda qset,fs,at=archive_table,cn=current_record: archive_record(qset,fs,at,cn))
archive_record(qset,fs,at,cn)) if is_active and is_active in fieldnames:
if 'is_active' in fieldnames:
self._before_delete.append( self._before_delete.append(
lambda qset: qset.update(is_active=False)) lambda qset: qset.update(is_active=False))
newquery = lambda query, t=self: t.is_active == True newquery = lambda query, t=self: t.is_active == True
gluon/tools.py
+5 -4
View File
@@ -1290,10 +1290,11 @@ class Auth(object):
""" """
tables = [table for table in tables] tables = [table for table in tables]
for table in tables: for table in tables:
table._archive_records( if 'modifed_on' in table.fields():
archive_db = archive_db, table._archive_records(
archive_name = archive_names, archive_db = archive_db,
current_record = current_record) archive_name = archive_names,
current_record = current_record)
def define_tables(self, username=False, signature=None, def define_tables(self, username=False, signature=None,
migrate=True, fake_migrate=False): migrate=True, fake_migrate=False):