From 9282bfcc600abdde6d0cf27699cefd1273a1b85e Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 19 Oct 2013 17:41:17 -0500 Subject: [PATCH] fixed issue 1732:ignore_common_filters missing in appadmin, thanks mweissen --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 12 ++++++------ applications/examples/controllers/appadmin.py | 12 ++++++------ applications/welcome/controllers/appadmin.py | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index 0a57f0c3..805d0588 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.10.18.12.25.51 +Version 2.7.4-stable+timestamp.2013.10.19.17.40.27 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 7afa5fb5..7a9fb58e 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -235,18 +235,18 @@ def select(): if match: table = match.group('table') try: - nrows = db(query).count() + nrows = db(query, ignore_common_filters=True).count() if form.vars.update_check and form.vars.update_fields: - db(query).update(**eval_in_global_env('dict(%s)' - % form.vars.update_fields)) + db(query, ignore_common_filters=True).update( + **eval_in_global_env('dict(%s)' % form.vars.update_fields)) response.flash = T('%s %%{row} updated', nrows) elif form.vars.delete_check: - db(query).delete() + db(query, ignore_common_filters=True).delete() response.flash = T('%s %%{row} deleted', nrows) - nrows = db(query).count() + nrows = db(query, ignore_common_filters=True).count() if orderby: rows = db(query, ignore_common_filters=True).select(limitby=( - start, stop), orderby=eval_in_global_env(orderby)) + start, stop), orderby=eval_in_global_env(orderby)) else: rows = db(query, ignore_common_filters=True).select( limitby=(start, stop)) diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index 7afa5fb5..7a9fb58e 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -235,18 +235,18 @@ def select(): if match: table = match.group('table') try: - nrows = db(query).count() + nrows = db(query, ignore_common_filters=True).count() if form.vars.update_check and form.vars.update_fields: - db(query).update(**eval_in_global_env('dict(%s)' - % form.vars.update_fields)) + db(query, ignore_common_filters=True).update( + **eval_in_global_env('dict(%s)' % form.vars.update_fields)) response.flash = T('%s %%{row} updated', nrows) elif form.vars.delete_check: - db(query).delete() + db(query, ignore_common_filters=True).delete() response.flash = T('%s %%{row} deleted', nrows) - nrows = db(query).count() + nrows = db(query, ignore_common_filters=True).count() if orderby: rows = db(query, ignore_common_filters=True).select(limitby=( - start, stop), orderby=eval_in_global_env(orderby)) + start, stop), orderby=eval_in_global_env(orderby)) else: rows = db(query, ignore_common_filters=True).select( limitby=(start, stop)) diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index 7afa5fb5..7a9fb58e 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -235,18 +235,18 @@ def select(): if match: table = match.group('table') try: - nrows = db(query).count() + nrows = db(query, ignore_common_filters=True).count() if form.vars.update_check and form.vars.update_fields: - db(query).update(**eval_in_global_env('dict(%s)' - % form.vars.update_fields)) + db(query, ignore_common_filters=True).update( + **eval_in_global_env('dict(%s)' % form.vars.update_fields)) response.flash = T('%s %%{row} updated', nrows) elif form.vars.delete_check: - db(query).delete() + db(query, ignore_common_filters=True).delete() response.flash = T('%s %%{row} deleted', nrows) - nrows = db(query).count() + nrows = db(query, ignore_common_filters=True).count() if orderby: rows = db(query, ignore_common_filters=True).select(limitby=( - start, stop), orderby=eval_in_global_env(orderby)) + start, stop), orderby=eval_in_global_env(orderby)) else: rows = db(query, ignore_common_filters=True).select( limitby=(start, stop))