From e7f2e494af9f2caff837a708bfe8039bb1edb775 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 3 May 2013 21:37:26 -0500 Subject: [PATCH] fixed Issue 1165:auth.signature: unable to reset is_active to true, thanks Ricardo --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 5 +++-- applications/examples/controllers/appadmin.py | 5 +++-- applications/welcome/controllers/appadmin.py | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index d0b50b4f..c10f91b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.03.08.26.50 +Version 2.4.6-stable+timestamp.2013.05.03.21.36.38 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 6952c856..08491195 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -279,14 +279,15 @@ def update(): (db, table) = get_table(request) keyed = hasattr(db[table], '_primarykey') record = None + db[table]._common_filter = None 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]], ignore_common_filters=True).select().first() + 0]]).select().first() else: record = db(db[table].id == request.args( - 2), ignore_common_filters=True).select().first() + 2)).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 6952c856..08491195 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -279,14 +279,15 @@ def update(): (db, table) = get_table(request) keyed = hasattr(db[table], '_primarykey') record = None + db[table]._common_filter = None 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]], ignore_common_filters=True).select().first() + 0]]).select().first() else: record = db(db[table].id == request.args( - 2), ignore_common_filters=True).select().first() + 2)).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 6952c856..08491195 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -279,14 +279,15 @@ def update(): (db, table) = get_table(request) keyed = hasattr(db[table], '_primarykey') record = None + db[table]._common_filter = None 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]], ignore_common_filters=True).select().first() + 0]]).select().first() else: record = db(db[table].id == request.args( - 2), ignore_common_filters=True).select().first() + 2)).select().first() if not record: qry = query_by_table_type(table, db)