reverted error commit
This commit is contained in:
@@ -1 +1 @@
|
||||
Version 2.7.2-stable+timestamp.2013.10.07.09.16.58
|
||||
Version 2.7.2-stable+timestamp.2013.10.09.09.04.33
|
||||
|
||||
+2
-2
@@ -514,11 +514,11 @@ def run_models_in(environment):
|
||||
for model in listdir(cpath, '^models_\w+\.pyc$', 0):
|
||||
restricted(read_pyc(model), environment, layer=model)
|
||||
path = pjoin(cpath, 'models')
|
||||
models = listdir(path, '^\w+\.pyc$', 0, sort=True)
|
||||
models = listdir(path, '^\w+\.pyc$', 0, sort=False)
|
||||
compiled = True
|
||||
else:
|
||||
path = pjoin(folder, 'models')
|
||||
models = listdir(path, '^\w+\.py$', 0, sort=True)
|
||||
models = listdir(path, '^\w+\.py$', 0, sort=False)
|
||||
compiled = False
|
||||
n = len(path) + 1
|
||||
for model in models:
|
||||
|
||||
+3
-2
@@ -2273,8 +2273,9 @@ class SQLFORM(FORM):
|
||||
limitby = None
|
||||
|
||||
try:
|
||||
# table_fields = filter(lambda f: f.tablename in tablenames, fields)
|
||||
table_fields = filter(lambda f: (f.tablename in tablenames) and (not(isinstance(f,Field.Virtual))),fields)
|
||||
table_fields = filter(
|
||||
lambda f: (f.tablename in tablenames) and \
|
||||
(not(isinstance(f,Field.Virtual))),fields)
|
||||
if dbset._db._adapter.dbengine=='google:datastore':
|
||||
rows = dbset.select(left=left,orderby=orderby,
|
||||
groupby=groupby,limitby=limitby,
|
||||
|
||||
Reference in New Issue
Block a user