diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-17 23:15:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-17 23:15:04 +0200 |
| commit | b12aa664246812b870b9c3aae3fd26caeeed0dbb (patch) | |
| tree | de0616833cc69f6095baba7a93eeacd182a5bbb1 /ishtar_common/views.py | |
| parent | e737bd2aa98ad908a533ba7a9e4793f581a61399 (diff) | |
| parent | b8222c46cee9f850b9f7c85c95500db256598abe (diff) | |
| download | Ishtar-b12aa664246812b870b9c3aae3fd26caeeed0dbb.tar.bz2 Ishtar-b12aa664246812b870b9c3aae3fd26caeeed0dbb.zip | |
Merge branch 'master' into v0.9
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') |