diff options
| -rw-r--r-- | ishtar_common/views.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index a70bb0c30..7a7c99953 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -581,7 +581,7 @@ HIERARCHIC_FIELDS = ['periods', 'period', 'unit', 'material_types', 'material_type', 'conservatory_state'] -def _get_values(val): +def _get_values(request, val): if hasattr(val, 'all'): # manage related objects vals = list(val.all()) else: @@ -743,7 +743,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], try: dct = {"pk": request.session[default_name]} pinned_search = unicode(model._meta.verbose_name)\ - + u" - " + unicode( + + u" - " + unicode( model.objects.get(pk=dct["pk"])) except model.DoesNotExist: pass @@ -1024,11 +1024,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[], val = list(val.all()) for v in val: v = getattr(v, ky) - new_vals += _get_values(v) + new_vals += _get_values(request, v) elif val: try: val = getattr(val, ky) - new_vals += _get_values(val) + new_vals += _get_values(request, val) except AttributeError: # must be a query key such as "contains" pass @@ -1159,7 +1159,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], val = data[1:][idx + delta].encode( ENCODING, errors='replace') if "|" in col_name[0]: - for delta_idx in range(len(col_name[0].split('|')) - 1): + for delta_idx in range( + len(col_name[0].split('|')) - 1): delta += 1 val += data[1:][idx + delta].encode( ENCODING, errors='replace') |