diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-17 23:22:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-17 23:22:35 +0200 |
| commit | da0282bd175dac6a704c36c9321a9348f1d43dd0 (patch) | |
| tree | 015cb51476f6ca65d4ea54312d4618a1d5d9bdea /ishtar_common/views.py | |
| parent | ca37b5b8f5be55b6172b7e3c6463a75f5380b36d (diff) | |
| parent | 0bfc89df0581dc5e0cc748629081fd5da3ae9271 (diff) | |
| download | Ishtar-da0282bd175dac6a704c36c9321a9348f1d43dd0.tar.bz2 Ishtar-da0282bd175dac6a704c36c9321a9348f1d43dd0.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index e05d63db3..0624d13d0 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -542,6 +542,15 @@ def get_item(model, func_name, default_name, extra_request_keys=[], table_cols += model.EXTRA_FULL_FIELDS else: table_cols = model.TABLE_COLS + + # contextual (full, simple, etc.) col + contxt = full and 'full' or 'simple' + if hasattr(model, 'CONTEXTUAL_TABLE_COLS') and \ + contxt in model.CONTEXTUAL_TABLE_COLS: + for idx, col in enumerate(table_cols): + if col in model.CONTEXTUAL_TABLE_COLS[contxt]: + table_cols[idx] = model.CONTEXTUAL_TABLE_COLS[contxt][col] + # manage sort tables manual_sort_key = None order = request_items.get('sord') |