').insertAfter($e).css({'display': 'none'});
- $e.data('valContainer', valContainer);
-
- $e.change(django_select2.onMultipleHiddenChange);
- if ($e.val()) {
- $e.change();
- }
- },
- convertArrToStr: function (arr) {
- return arr.join(django_select2.MULTISEPARATOR);
- },
- runInContextHelper: function (f, id) {
- return function () {
- var args = Array.prototype.slice.call(arguments);
- return f.apply($('#' + id).get(0), args);
- }
- }
-};
-
-(function( $ ){
- // This sets or gets the text lables for an element. It merely takes care returing array or single
- // value, based on if element is multiple type.
- $.fn.txt = function(val) {
- if (typeof(val) !== 'undefined') {
- if (val) {
- if (val instanceof Array) {
- if (this.attr('multiple')) {
- val = django_select2.convertArrToStr(val);
- } else {
- val = val[0]
+ if (!isMultiple) {
+ val = [val];
+ if (txt || txt === 0) {
+ txt = [txt];
}
}
- this.attr('txt', val);
+
+ if (txt || txt === 0) {
+ return [val, txt];
+ }
+
+ f = $e.data('userGetValText');
+ if (f) {
+ txt = f($e, val, isMultiple);
+ if (txt || txt === 0) {
+ return [val, txt];
+ }
+ }
+
+ if (res) {
+ txt = [];
+ $(val).each(function (idx) {
+ var i, value = this;
+
+ for (i in res) {
+ if (res[i].id == value) {
+ val[idx] = res[i].id; // To set it to correct data type.
+ txt.push(res[i].text);
+ }
+ }
+ });
+ if (txt || txt === 0) {
+ return [val, txt];
+ }
+ }
+
+ if (isGetFromCookieAllowed) {
+ txt = [];
+ $(val).each(function (idx) {
+ var value = this, cookieVal;
+
+ cookieVal = django_select2.getCookie(id + '_heavy_val:' + idx);
+
+ if (cookieVal == value) {
+ txt.push(django_select2.getCookie(id + '_heavy_txt:' + idx));
+ }
+ });
+ if (txt || txt === 0) {
+ return [val, txt];
+ }
+ }
+
}
- return this;
- } else {
- val = this.attr('txt');
- if (val && this.attr('multiple')) {
- val = val.split(django_select2.MULTISEPARATOR);
+ return null;
+ },
+ onInit: function (e, callback) {
+ e = $(e);
+ var id = e.attr('id'), data = null, val = e.select2('val');
+
+ if (!val && val !== 0) {
+ val = e.data('initVal');
}
- return val;
+
+ if (val || val === 0) {
+ // Value is set so need to get the text.
+ data = django_select2.getValText(e);
+ if (data && data[0]) {
+ data = django_select2.prepareValText(data[0], data[1], !!e.attr('multiple'));
+ }
+ }
+ if (!data) {
+ e.val(null); // Nulling out set value so as not to confuse users.
+ }
+ callback(data); // Change for 2.3.x
+ },
+ onMultipleHiddenChange: function () {
+ var $e = $(this), valContainer = $e.data('valContainer'), name = $e.data('name'), vals = $e.val();
+ valContainer.empty();
+ if (vals) {
+ vals = vals.split(django_select2.MULTISEPARATOR);
+ $(vals).each(function () {
+ var inp = $('
').appendTo(valContainer);
+ inp.attr('name', name);
+ inp.val(this);
+ });
+ }
+ },
+ initMultipleHidden: function ($e) {
+ var valContainer;
+
+ $e.data('name', $e.attr('name'));
+ $e.attr('name', '');
+
+ valContainer = $('
').insertAfter($e).css({'display': 'none'});
+ $e.data('valContainer', valContainer);
+
+ $e.change(django_select2.onMultipleHiddenChange);
+ if ($e.val()) {
+ $e.change();
+ }
+ },
+ convertArrToStr: function (arr) {
+ return arr.join(django_select2.MULTISEPARATOR);
+ },
+ runInContextHelper: function (f, id) {
+ return function () {
+ var args = Array.prototype.slice.call(arguments);
+ return f.apply($('#' + id).get(0), args);
+ }
}
};
-})( jQuery );
\ No newline at end of file
+
+ (function( $ ){
+ // This sets or gets the text lables for an element. It merely takes care returing array or single
+ // value, based on if element is multiple type.
+ $.fn.txt = function(val) {
+ if (typeof(val) !== 'undefined') {
+ if (val) {
+ if (val instanceof Array) {
+ if (this.attr('multiple')) {
+ val = django_select2.convertArrToStr(val);
+ } else {
+ val = val[0]
+ }
+ }
+ this.attr('txt', val);
+ }
+ return this;
+ } else {
+ val = this.attr('txt');
+ if (val && this.attr('multiple')) {
+ val = val.split(django_select2.MULTISEPARATOR);
+ }
+ return val;
+ }
+ };
+ })( jQuery );
+}
\ No newline at end of file
diff --git a/django_select2/widgets.py b/django_select2/widgets.py
index e1a199d..f6d7085 100644
--- a/django_select2/widgets.py
+++ b/django_select2/widgets.py
@@ -207,7 +207,15 @@ class HeavySelect2MultipleWidget(HeavySelect2Mixin, MultipleSelect2HiddenInput):
### Auto Heavy widgets ###
-class AutoHeavySelect2Mixin(HeavySelect2Mixin):
+class AutoHeavySelect2Mixin(object):
+ def __init__(self, *args, **kwargs):
+ if hasattr(self.__class__, 'field_id'): # By the time AutoViewFieldMixin runs widget is not instantiated
+ # so it sets the value on the widget class.
+ self.field_id = getattr(self.__class__, 'field_id')
+ delattr(self.__class__, 'field_id')
+
+ super(AutoHeavySelect2Mixin, self).__init__(*args, **kwargs)
+
def render_inner_js_code(self, id_, *args):
js = u"$('#%s').data('field_id', '%s');" % (id_, self.field_id)
js += super(AutoHeavySelect2Mixin, self).render_inner_js_code(id_, *args)
diff --git a/testapp/test.db b/testapp/test.db
index 0c694af..9873b79 100644
Binary files a/testapp/test.db and b/testapp/test.db differ
diff --git a/testapp/testapp/templates/index.html b/testapp/testapp/templates/index.html
index 5768d1c..a39027c 100644
--- a/testapp/testapp/templates/index.html
+++ b/testapp/testapp/templates/index.html
@@ -8,5 +8,6 @@