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

fixed problem with alias and record versioning

Browse Source
This commit is contained in:
mdipierro
2013-07-29 07:51:36 -05:00
parent abeb4541fe
commit 0019dad19c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.07.28.05.46.47 Version 2.6.0-development+timestamp.2013.07.29.07.50.41
gluon/dal.py
+3 -3
View File
@@ -8348,10 +8348,10 @@ class Table(object):
if is_active and is_active in fieldnames: if is_active and 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: \ newquery = lambda query, t=self, name=self._tablename: \
reduce(AND,[db[tn].is_active == True reduce(AND,[db[tn].is_active == True
for tn in db._adapter.tables(query) for tn in db._adapter.tables(query)
if tn==t.name or getattr(db[tn],'_ot',None)==t.name]) if tn==name or getattr(db[tn],'_ot',None)==name])
query = self._common_filter query = self._common_filter
if query: if query:
newquery = query & newquery newquery = query & newquery
@@ -8584,7 +8584,7 @@ class Table(object):
for field in self: for field in self:
if field.type=='upload' and field.name in fields: if field.type=='upload' and field.name in fields:
value = fields[field.name] value = fields[field.name]
if value and not isinstance(value,str): if value is not None and not isinstance(value,str):
if hasattr(value,'file') and hasattr(value,'filename'): if hasattr(value,'file') and hasattr(value,'filename'):
new_name = field.store(value.file,filename=value.filename) new_name = field.store(value.file,filename=value.filename)
elif hasattr(value,'read') and hasattr(value,'name'): elif hasattr(value,'read') and hasattr(value,'name'):