Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/views.py

1 files changed, 4 insertions, 1 deletions

diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index b8b104a61..6d9600d0c 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -513,13 +513,15 @@ 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):
+                 new=False, new_message="", source_full=None,
+                 multiple_select=False):
         self.source = source
         self.form = form
         self.attrs = attrs
         self.associated_model = associated_model
         self.table_cols = table_cols
         self.multiple = multiple
+        self.multiple_select = multiple_select
         self.multiple_cols = multiple_cols
         self.new, self.new_message = new, new_message
         self.source_full = source_full
@@ -604,6 +606,7 @@ class JQueryJqGrid(forms.RadioSelect):
                     'remove': unicode(_(u"Remove")),
                     'sname': name.replace('-', ''),
                     'multiple': self.multiple,
+                    'multiple_select': self.multiple_select,
                     'multi_cols': ",".join((u'"%d"' % col
                                            for col in self.multiple_cols))})
         t = loader.get_template('blocks/JQueryJqGrid.html')