From 1ef131354f6e4a66afb716621d94b6449ca67ada Mon Sep 17 00:00:00 2001 From: mdipierro Date: Tue, 21 Aug 2012 09:52:23 -0500 Subject: [PATCH] fixed common field concatenation --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b7270891..9ffcfd3d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-21 09:06:18) dev +Version 2.00.0 (2012-08-21 09:52:19) dev diff --git a/gluon/dal.py b/gluon/dal.py index 188b2550..4be920b8 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -6954,7 +6954,7 @@ def index(): **args ): if self._common_fields: - fields = fields + self._common_fields + fields = list(fields) + list(self._common_fields) table_class = args.get('table_class',Table) table = table_class(self, tablename, *fields, **args)