fixed Issue 1165:auth.signature: unable to reset is_active to true, thanks Ricardo
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -279,14 +279,15 @@ def update():
|
|||||||
(db, table) = get_table(request)
|
(db, table) = get_table(request)
|
||||||
keyed = hasattr(db[table], '_primarykey')
|
keyed = hasattr(db[table], '_primarykey')
|
||||||
record = None
|
record = None
|
||||||
|
db[table]._common_filter = None
|
||||||
if keyed:
|
if keyed:
|
||||||
key = [f for f in request.vars if f in db[table]._primarykey]
|
key = [f for f in request.vars if f in db[table]._primarykey]
|
||||||
if key:
|
if key:
|
||||||
record = db(db[table][key[0]] == request.vars[key[
|
record = db(db[table][key[0]] == request.vars[key[
|
||||||
0]], ignore_common_filters=True).select().first()
|
0]]).select().first()
|
||||||
else:
|
else:
|
||||||
record = db(db[table].id == request.args(
|
record = db(db[table].id == request.args(
|
||||||
2), ignore_common_filters=True).select().first()
|
2)).select().first()
|
||||||
|
|
||||||
if not record:
|
if not record:
|
||||||
qry = query_by_table_type(table, db)
|
qry = query_by_table_type(table, db)
|
||||||
|
|||||||
@@ -279,14 +279,15 @@ def update():
|
|||||||
(db, table) = get_table(request)
|
(db, table) = get_table(request)
|
||||||
keyed = hasattr(db[table], '_primarykey')
|
keyed = hasattr(db[table], '_primarykey')
|
||||||
record = None
|
record = None
|
||||||
|
db[table]._common_filter = None
|
||||||
if keyed:
|
if keyed:
|
||||||
key = [f for f in request.vars if f in db[table]._primarykey]
|
key = [f for f in request.vars if f in db[table]._primarykey]
|
||||||
if key:
|
if key:
|
||||||
record = db(db[table][key[0]] == request.vars[key[
|
record = db(db[table][key[0]] == request.vars[key[
|
||||||
0]], ignore_common_filters=True).select().first()
|
0]]).select().first()
|
||||||
else:
|
else:
|
||||||
record = db(db[table].id == request.args(
|
record = db(db[table].id == request.args(
|
||||||
2), ignore_common_filters=True).select().first()
|
2)).select().first()
|
||||||
|
|
||||||
if not record:
|
if not record:
|
||||||
qry = query_by_table_type(table, db)
|
qry = query_by_table_type(table, db)
|
||||||
|
|||||||
@@ -279,14 +279,15 @@ def update():
|
|||||||
(db, table) = get_table(request)
|
(db, table) = get_table(request)
|
||||||
keyed = hasattr(db[table], '_primarykey')
|
keyed = hasattr(db[table], '_primarykey')
|
||||||
record = None
|
record = None
|
||||||
|
db[table]._common_filter = None
|
||||||
if keyed:
|
if keyed:
|
||||||
key = [f for f in request.vars if f in db[table]._primarykey]
|
key = [f for f in request.vars if f in db[table]._primarykey]
|
||||||
if key:
|
if key:
|
||||||
record = db(db[table][key[0]] == request.vars[key[
|
record = db(db[table][key[0]] == request.vars[key[
|
||||||
0]], ignore_common_filters=True).select().first()
|
0]]).select().first()
|
||||||
else:
|
else:
|
||||||
record = db(db[table].id == request.args(
|
record = db(db[table].id == request.args(
|
||||||
2), ignore_common_filters=True).select().first()
|
2)).select().first()
|
||||||
|
|
||||||
if not record:
|
if not record:
|
||||||
qry = query_by_table_type(table, db)
|
qry = query_by_table_type(table, db)
|
||||||
|
|||||||
Reference in New Issue
Block a user