JQueryJqGrid by default sorting is made using ordering in meta

6 files changed, 54 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 947a0dfef..484d2af20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ oook_replace
 .cache
 dist
 ishtar.egg-info
+.idea
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index bbfb410f8..7df766f2f 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -121,13 +121,13 @@ post_delete.connect(post_save_cache, sender=IdentificationType)
 class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
     SHOW_URL = 'show-contextrecord'
     SLUG = 'contextrecord'
-    TABLE_COLS = ['parcel.town', 'operation.year',
-                  'operation.operation_code',
+    TABLE_COLS = ['parcel__town', 'operation__year',
+                  'operation__operation_code',
                   'label', 'unit']
     if settings.COUNTRY == 'fr':
-        TABLE_COLS.insert(1, 'operation.code_patriarche')
+        TABLE_COLS.insert(1, 'operation__code_patriarche')
     TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
-                          'datings.period', 'description']
+                          'datings__period', 'description']
     TABLE_COLS_FOR_OPE_LBL = {'section__parcel_number': _("Parcel")}
     CONTEXTUAL_TABLE_COLS = {
         'full': {
@@ -140,6 +140,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
     EXTRA_REQUEST_KEYS = {
         'parcel__town': 'parcel__town__pk',
         'operation__year': 'operation__year__contains',
+        'year': 'operation__year__contains',
         'operation__code_patriarche': 'operation__code_patriarche',
         'operation__operation_code': 'operation__operation_code',
         'datings__period': 'datings__period__pk',
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index faa2d9e93..607f81f7d 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -84,7 +84,7 @@ jQuery(document).ready(function(){
       {{extra_cols|safe}}
     ],
     height: 300,
-    sortname: 'value',
+    sortname: '__default__',
     viewrecords: true,
     sortorder: "asc",
     emptyrecords: "{{no_result}}",
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 4a81a64fb..f751cebe3 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -27,7 +27,7 @@ setTimeout(
           {name:'link', index:'link', width:30},
           {{extra_cols|safe}}
         ],
-        sortname: 'value',
+        sortname: '__default__',
         viewrecords: true,
         sortorder: "asc",
         emptyrecords: "{{no_result}}",
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index bc5e5ef1d..cd34a2019 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -25,6 +25,7 @@ import cStringIO as StringIO
 import datetime
 import ho.pisa as pisa
 import json
+import logging
 from markdown import markdown
 import optparse
 import re
@@ -75,6 +76,8 @@ import models
 CSV_OPTIONS = {'delimiter': ';', 'quotechar': '"', 'quoting': csv.QUOTE_ALL}
 ENCODING = settings.ENCODING or 'utf-8'
 
+logger = logging.getLogger(__name__)
+
 
 def index(request):
     """
@@ -334,7 +337,7 @@ def update_current_item(request, item_type=None, pk=None):
     request.session['SHORTCUT_SEARCH'] = 'all'
 
     currents = get_current_items(request)
-    # reinit when descending item are not relevant
+    # re-init when descending item are not relevant
     if item_type == 'file' and currents['file'] and currents['operation'] and \
             currents['operation'].associated_file != currents['file']:
         request.session["operation"] = ''
@@ -428,7 +431,6 @@ def autocomplete_person(request, person_types=None, attached_to=None,
             pass
     if is_ishtar_user:
         query = query & Q(ishtaruser__isnull=False)
-    limit = 20
     persons = models.Person.objects.filter(query)[:limit]
     data = json.dumps([{'id': person.pk, 'value': unicode(person)}
                        for person in persons if person])
@@ -696,7 +698,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                         dct[k] = not dct[k]
                     # check also for empty value with image field
                     field_name = k.split('__')[0]
-                    # TODO: can be improved in later evrsion of Django
+                    # TODO: can be improved in later version of Django
                     try:
                         c_field = model._meta.get_field(field_name)
                         if k.endswith('__isnull') and \
@@ -811,7 +813,6 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
 
         items = model.objects.filter(query).distinct()
         # print(items.query)
-        q = request_items.get('sidx')
 
         # table cols
         if own_table_cols:
@@ -841,7 +842,12 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
         manual_sort_key = None
         order = request_items.get('sord')
         sign = order and order == u'desc' and "-" or ''
-        if q and q in request_keys:
+
+        q = request_items.get('sidx')
+        if q == '__default__' and model._meta.ordering:
+            orders = [sign + k for k in model._meta.ordering]
+            items = items.order_by(*orders)
+        elif q and q in request_keys:
             ks = request_keys[q]
             if type(ks) not in (list, tuple):
                 ks = [ks]
@@ -859,6 +865,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                     ke = ke[0]
                 if ke.endswith(q):
                     manual_sort_key = ke
+                    logger.warning("**WARN get_item - {}**: manual sort key '{"
+                                   "}'".format(func_name, q))
                     break
             if not manual_sort_key and model._meta.ordering:
                 orders = [sign + k for k in model._meta.ordering]
@@ -903,7 +911,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                 my_vals = []
                 for k in keys:
                     vals = [item]
-                    # foreign key may be splited by "." or "__"
+                    # foreign key may be divided by "." or "__"
                     splitted_k = []
                     for ky in k.split('.'):
                         if '__' in ky:
@@ -973,8 +981,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                     lnk = link_template % reverse('show-' + default_name,
                                                   args=[data[0], ''])
                 except NoReverseMatch:
-                    print '"show-' + default_name + "\" args (" + \
-                          unicode(data[0]) + ") url not available"
+                    print(
+                        '"show-' + default_name + "\" args ("
+                        + unicode(data[0]) + ") url not available")
                     lnk = ''
                 res = {'id': data[0], 'link': lnk}
                 for idx, value in enumerate(data[1:]):
@@ -983,7 +992,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
                         if type(table_col) not in (list, tuple):
                             table_col = [table_col]
                         tab_cols = []
-                        # foreign key may be splited by "." or "__"
+                        # foreign key may be divided by "." or "__"
                         for tc in table_col:
                             if '.' in tc:
                                 tab_cols.append(tc.split('.')[-1])
@@ -1073,7 +1082,9 @@ def show_item(model, name, extra_dct=None):
         dct['CURRENCY'] = get_current_profile().currency
         dct['ENCODING'] = settings.ENCODING
         dct['current_window_url'] = url_name
-        date = 'date' in dct and dct.pop('date')
+        date = None
+        if 'date' in dct:
+            date = dct.pop('date')
         dct['window_id'] = "%s-%d-%s" % (
             name, item.pk, datetime.datetime.now().strftime('%M%s'))
         if hasattr(item, 'history'):
@@ -1306,9 +1317,7 @@ def dashboard_main(request, dct, obj_id=None, *args, **kwargs):
     return render_to_response('ishtar/dashboards/dashboard_main.html', dct,
                               context_instance=RequestContext(request))
 
-DASHBOARD_FORMS = {}
-DASHBOARD_FORMS['files'] = DashboardFormFile
-DASHBOARD_FORMS['operations'] = DashboardFormOpe
+DASHBOARD_FORMS = {'files': DashboardFormFile, 'operations': DashboardFormOpe}
 
 
 def dashboard_main_detail(request, item_name):
@@ -1339,6 +1348,7 @@ def dashboard_main_detail(request, item_name):
         else:
             form = DASHBOARD_FORMS[item_name]()
     lbl, dashboard = None, None
+    dashboard_kwargs = {}
     if (item_name == 'files' and profile.files) \
             or item_name == 'operations':
         dashboard_kwargs = {'slice': slicing, 'fltr': fltr,
@@ -1375,7 +1385,7 @@ def dashboard_main_detail(request, item_name):
 
 
 def reset_wizards(request):
-    # dynamicaly execute each reset_wizards of each ishtar app
+    # dynamically execute each reset_wizards of each ishtar app
     for app in settings.INSTALLED_APPS:
         if app == 'ishtar_common':
             # no need for infinite recursion
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index 9e656311b..d3a2c975e 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -516,10 +516,29 @@ class JQueryJqGrid(forms.RadioSelect):
     def __init__(self, source, form, associated_model, attrs={},
                  table_cols='TABLE_COLS', multiple=False, multiple_cols=[2],
                  new=False, new_message="", source_full=None,
-                 multiple_select=False):
+                 multiple_select=False, sortname="__default__"):
+        """
+        JQueryJqGrid widget init.
+
+        :param source: url to get the item from -- get_item
+        :param form:
+        :param associated_model: model of the listed items
+        :param attrs:
+        :param table_cols:
+        :param multiple:
+        :param multiple_cols:
+        :param new:
+        :param new_message:
+        :param source_full: url to get full listing
+        :param multiple_select:
+        :param sortname: column name (model attribute) to use to sort
+        """
+        super(JQueryJqGrid, self).__init__(attrs=attrs)
         self.source = source
         self.form = form
-        self.attrs = attrs
+        if not attrs:
+            attrs = {}
+        self.attrs = attrs.copy()
         self.associated_model = associated_model
         self.table_cols = table_cols
         self.multiple = multiple
@@ -527,6 +546,7 @@ class JQueryJqGrid(forms.RadioSelect):
         self.multiple_cols = multiple_cols
         self.new, self.new_message = new, new_message
         self.source_full = source_full
+        self.sortname = sortname
 
     def get_cols(self, python=False):
         jq_col_names, extra_cols = [], []