From 5a5113e10a47b4c5770dcf61a01aeb0cdea6b78e Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Tue, 6 Dec 2011 17:00:04 -0600 Subject: [PATCH] fixed appadmin.py with ignore_common_filters, thanks Yair --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 11 +++++------ applications/examples/controllers/appadmin.py | 11 +++++------ applications/welcome/controllers/appadmin.py | 11 +++++------ gluon/custom_import.py | 17 +++++++++-------- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/VERSION b/VERSION index 5c9802df..a51f0ee3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.3 (2011-12-06 08:28:04) dev +Version 1.99.3 (2011-12-06 16:59:36) dev diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 927103b9..7a2ce1f7 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -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(ignore_common_filter=True)) + return str(db(query,ignore_common_filters=True).select()) def import_csv(table, file): @@ -225,10 +225,9 @@ def select(): response.flash = T('%s rows deleted', nrows) nrows = db(query).count() if orderby: - rows = db(query).select(limitby=(start, stop),ignore_common_filter=True, - orderby=eval_in_global_env(orderby)) + rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby)) else: - rows = db(query).select(limitby=(start, stop), ignore_common_filter=True) + rows = db(query,ignore_common_filters=True).select(limitby=(start, stop)) except Exception, e: (rows, nrows) = ([], 0) response.flash = DIV(T('Invalid Query'),PRE(str(e))) @@ -255,9 +254,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(ignore_common_filter=True).first() + record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first() else: - record = db(db[table].id == request.args(2)).select(ignore_common_filter=True).first() + record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first() if not record: qry = query_by_table_type(table, db) diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index 927103b9..7a2ce1f7 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -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(ignore_common_filter=True)) + return str(db(query,ignore_common_filters=True).select()) def import_csv(table, file): @@ -225,10 +225,9 @@ def select(): response.flash = T('%s rows deleted', nrows) nrows = db(query).count() if orderby: - rows = db(query).select(limitby=(start, stop),ignore_common_filter=True, - orderby=eval_in_global_env(orderby)) + rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby)) else: - rows = db(query).select(limitby=(start, stop), ignore_common_filter=True) + rows = db(query,ignore_common_filters=True).select(limitby=(start, stop)) except Exception, e: (rows, nrows) = ([], 0) response.flash = DIV(T('Invalid Query'),PRE(str(e))) @@ -255,9 +254,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(ignore_common_filter=True).first() + record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first() else: - record = db(db[table].id == request.args(2)).select(ignore_common_filter=True).first() + record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first() if not record: qry = query_by_table_type(table, db) diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index 927103b9..7a2ce1f7 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -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(ignore_common_filter=True)) + return str(db(query,ignore_common_filters=True).select()) def import_csv(table, file): @@ -225,10 +225,9 @@ def select(): response.flash = T('%s rows deleted', nrows) nrows = db(query).count() if orderby: - rows = db(query).select(limitby=(start, stop),ignore_common_filter=True, - orderby=eval_in_global_env(orderby)) + rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby)) else: - rows = db(query).select(limitby=(start, stop), ignore_common_filter=True) + rows = db(query,ignore_common_filters=True).select(limitby=(start, stop)) except Exception, e: (rows, nrows) = ([], 0) response.flash = DIV(T('Invalid Query'),PRE(str(e))) @@ -255,9 +254,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(ignore_common_filter=True).first() + record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first() else: - record = db(db[table].id == request.args(2)).select(ignore_common_filter=True).first() + record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first() if not record: qry = query_by_table_type(table, db) diff --git a/gluon/custom_import.py b/gluon/custom_import.py index 4fce8596..15873f47 100644 --- a/gluon/custom_import.py +++ b/gluon/custom_import.py @@ -9,13 +9,13 @@ import threading # Install the new import function: def custom_import_install(web2py_path): - global _web2py_importer - global _web2py_path - if isinstance(__builtin__.__import__, _Web2pyImporter): - return #aready installed - _web2py_path = web2py_path - _web2py_importer = _Web2pyImporter(web2py_path) - __builtin__.__import__ = _web2py_importer + global _web2py_importer + global _web2py_path + if isinstance(__builtin__.__import__, _Web2pyImporter): + return #aready installed + _web2py_path = web2py_path + _web2py_importer = _Web2pyImporter(web2py_path) + __builtin__.__import__ = _web2py_importer def is_tracking_changes(): """ @@ -41,7 +41,7 @@ def track_changes(track=True): if track: if not _web2py_date_tracker_importer: _web2py_date_tracker_importer = \ - _Web2pyDateTrackerImporter(_web2py_path) + _Web2pyDateTrackerImporter(_web2py_path) __builtin__.__import__ = _web2py_date_tracker_importer else: __builtin__.__import__ = _web2py_importer @@ -326,3 +326,4 @@ class _Web2pyDateTrackerImporter(_Web2pyImporter, _DateTrackerImporter): +