Label generation: view to generate labels

1 files changed, 16 insertions, 14 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 557058728..01475f6ae 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -1243,7 +1243,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
     :return:
     """
     def func(request, data_type='json', full=False, force_own=False,
-             col_names=None, **dct):
+             col_names=None, no_link=False, no_limit=False, **dct):
         available_perms = []
         if specific_perms:
             available_perms = specific_perms[:]
@@ -1395,8 +1395,9 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
 
         if data_type == 'json-map':  # other limit for map
             row_nb = settings.ISHTAR_MAP_MAX_ITEMS
-            if request_items.get('no_limit', False):
-                row_nb = None
+        if no_limit or (data_type == 'json-map' and
+                        request_items.get('no_limit', False)):
+            row_nb = None
 
         dct_request_items = {}
 
@@ -1471,7 +1472,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
                 dct, pinned_search = _manage_default_search(
                     dct, request, model, default_name, my_base_request,
                     my_relative_session_names)
-        else:
+        elif func_name:
             request.session[func_name] = dct
 
         for k in request_keys:
@@ -1762,19 +1763,20 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
                 data = json.dumps(_format_geojson(datas, lnk))
                 return HttpResponse(data, content_type='application/json')
             for data in datas:
-                try:
-                    lnk_template = link_template
-                    lnk = lnk_template % reverse('show-' + default_name,
-                                                 args=[data[0], ''])
-                except NoReverseMatch:
-                    logger.warning(
-                        '**WARN "show-' + default_name + '" args ('
-                        + str(data[0]) + ") url not available")
-                    lnk = ''
                 res = {
                     'id': data[0],
-                    'link': lnk
                 }
+                if not no_link:
+                    try:
+                        lnk_template = link_template
+                        lnk = lnk_template % reverse('show-' + default_name,
+                                                     args=[data[0], ''])
+                    except NoReverseMatch:
+                        logger.warning(
+                            '**WARN "show-' + default_name + '" args ('
+                            + str(data[0]) + ") url not available")
+                        lnk = ''
+                    res["link"] = lnk
                 for idx, value in enumerate(data[1:]):
                     if value:
                         table_col = table_cols[idx]