Merge branch 'master' into v0.9

1 files changed, 22 insertions, 3 deletions

diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index 9e656311b..1183836bc 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -431,7 +431,6 @@ class JQueryPersonOrganization(forms.TextInput):
 
     @classmethod
     def encode_source(cls, source):
-        encoded_src = ''
         if isinstance(source, list):
             encoded_src = JSONEncoder().encode(source)
         elif isinstance(source, str) \
@@ -516,10 +515,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 +545,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 = [], []