db.define_table(...,common_filter) and db(...,ignore_common_filter=True), thanks Yair Eshel

This commit is contained in:
Massimo Di Pierro
2011-12-04 17:45:28 -06:00
parent cf413e568f
commit d92dec8451
5 changed files with 68 additions and 38 deletions
@@ -150,7 +150,7 @@ def csv():
return None
response.headers['Content-disposition'] = 'attachment; filename=%s_%s.csv'\
% tuple(request.vars.query.split('.')[:2])
return str(db(query).select())
return str(db(query).select(ignore_common_filter=True))
def import_csv(table, file):
@@ -225,10 +225,10 @@ def select():
response.flash = T('%s rows deleted', nrows)
nrows = db(query).count()
if orderby:
rows = db(query).select(limitby=(start, stop),
rows = db(query).select(limitby=(start, stop),ignore_common_filter=True,
orderby=eval_in_global_env(orderby))
else:
rows = db(query).select(limitby=(start, stop))
rows = db(query).select(limitby=(start, stop), ignore_common_filter=True)
except Exception, e:
(rows, nrows) = ([], 0)
response.flash = DIV(T('Invalid Query'),PRE(str(e)))
@@ -255,9 +255,9 @@ def update():
if keyed:
key = [f for f in request.vars if f in db[table]._primarykey]
if key:
record = db(db[table][key[0]] == request.vars[key[0]]).select().first()
record = db(db[table][key[0]] == request.vars[key[0]]).select(ignore_common_filter=True).first()
else:
record = db(db[table].id == request.args(2)).select().first()
record = db(db[table].id == request.args(2)).select(ignore_common_filter=True).first()
if not record:
qry = query_by_table_type(table, db)