Commit Graph

388 Commits

Author SHA1 Message Date
Johannes Hoppe 1224b8d65c Merge pull request #176 from emorozov/master
Support proper translation of placeholders using ugettext_lazy.
2015-06-08 11:02:59 +02:00
Eugene Morozov 8cc2253a5b Support proper translation of placeholders using ugettext_lazy. 2015-06-08 14:51:03 +06:00
Quantum b5a154d425 Fix HeavySelect2MultipleWidget
"selector not found" error similar to 2bf42c5bda.

Closed #174
2015-06-01 10:22:49 +01:00
Pawel Iwaszko 77cecbd1cf Added failing test for HeavySelect2MultipleWidget
Closed #175
2015-06-01 10:21:01 +01:00
AppleGrew 7850d52b64 Merge pull request #171 from GeyseR/patch-2
return list of css links instead of generator
2015-05-22 03:04:35 +05:30
Sergey Fursov bfee65fc95 return list of css links instead of generator 2015-05-05 15:59:16 +03:00
Nirupam Biswas 5f9477b664 Version 4.3.1 2015-04-29 01:14:11 +05:30
AppleGrew b2917fff53 Merge pull request #170 from GeyseR/patch-1
Fixed bug in minify pre-setup function
2015-04-29 01:08:14 +05:30
Sergey Fursov c7101223f8 updated minified versions of static files 2015-04-28 19:53:05 +03:00
Sergey Fursov b19f166992 Fixed bug in minify pre-setup function
Collect all files from collection instead of last one only
2015-04-28 17:35:55 +03:00
Nirupam Biswas a57cb59436 Fixing setup.py and releasing 4.3.0. 2015-04-27 22:19:15 +05:30
Johannes Hoppe 6092d96aea Merge pull request #168 from bcail/master
Fixed HeavySelect2Widget (incl automated test)
2015-04-24 11:04:14 +02:00
Ben Cail 2bf42c5bda fix HeavySelect2Widget (with automated test) 2015-04-20 15:31:04 -04:00
Jonathan Senecal 1419dd9121 Fix selector is not defined javascript error
Closed #167
2015-04-13 18:45:35 +02:00
Jonathan Senecal 439852102b Updated select2.js to 3.5.2 2015-04-13 18:45:25 +02:00
Jonathan Senecal 88e88f53bd Fix "No reverse match" issue with template. 2015-04-13 18:45:25 +02:00
Jonathan Senecal 13065d09e8 Added the "fields" attribute in testapp
django.core.exceptions.ImproperlyConfigured: Creating a ModelForm without either the 'fields' attribute or the 'exclude' attribute is prohibited; form SchoolForm needs updating.
- Added the "fields" attribute to SchoolForm
- Added the "fields" attribute to EmployeeForm
- Added the "fields" attribute to DeptForm
- Added the "fields" attribute to QuestionForm
- Added the "fields" attribute to QuestionNonAutoForm
2015-04-13 18:44:06 +02:00
Jonathan Senecal 1b5e7e18d3 PEP8 + simple typo 2015-04-13 18:42:30 +02:00
Jonathan Senecal 2737bb996b Fixed simple typo 2015-04-13 18:42:30 +02:00
Johannes Hoppe cc9ded6fdc Fixed #103 -- Fixed inheritance issue
Both mixins implemented almost an identical functionaly and both called super.
That caused AutoHeavySelect2Mixin to call the wrong super class and executed wrong js code.
2015-04-10 11:10:42 +02:00
Johannes Hoppe d988cc683e Removed method check because it done by dispatch 2015-04-10 10:16:01 +02:00
Johannes Hoppe 5d9b463f2e Added six for metaclasses 2015-04-10 10:15:20 +02:00
Johannes Hoppe 8377f31f2e Merge pull request #160 from superqwer/django18
Fixed django1.8 compatibility issues
2015-04-08 17:56:25 +02:00
Johannes Hoppe 3126434a8f Merge pull request #161 from bcail/master
Fixed Select2Mixin hashedSelector
2015-04-08 17:55:10 +02:00
Johannes Hoppe b07ad8939c Removed Django from install requirements added 1.8 tests 2015-04-08 17:46:29 +02:00
Ben Cail 537c8ec40b Select2Widget test: move general error check to the end of the function; test that the select2 results get displayed when the widget is clicked 2015-04-08 08:47:34 -04:00
Johannes Hoppe d9d928a336 Merge pull request #159 from superqwer/imports
Fixed imports
2015-04-08 09:13:00 +02:00
Ben Cail 12b00c1084 define hashedSelector in Select2Mixin 2015-04-06 14:41:24 -04:00
Ben Cail 28e8b54425 add a failing test for Select2Widget (hashedSelector not defined) 2015-04-06 14:29:13 -04:00
superqwer bedb4b3c24 django1.8 compatibility issues 2015-04-06 16:31:23 +03:00
superqwer bd761ec197 relative import fix 2015-04-06 15:58:42 +03:00
Johannes Hoppe 42b73198b7 Fixed import order 2015-04-02 18:54:08 +02:00
Dylan Verheul 28c2d5649e Resolved #83 -- Refactored widget Media
Squashed commit of the following:

commit 2544866077707f068ab2c411a1dbcea4e3ec47e8
Author: Dylan Verheul <dylan@zostera.nl>
Date:   Thu Dec 12 13:16:22 2013 +0100

    Proper fixing of #81 and #82

commit 8e640a874d96171befae023c8d7c1dcb43e2bd6d
Author: Dylan Verheul <dylan@zostera.nl>
Date:   Thu Dec 12 11:50:43 2013 +0100

    Move testing of RENDER_SELECT2_STATICS to Media class, fixes #81
2015-04-02 18:44:23 +02:00
AppleGrew d06ed16544 Added Travis build status to README.md 2015-03-31 20:07:22 +05:30
Johannes Hoppe 32c1e1eb5b Merge pull request #156 from onysos/master
fix on 4.2.2 with django 1.7 : is_hidden = True
2015-03-31 15:25:02 +02:00
Johannes Hoppe bd40acc761 Added six types and fixed setup 2015-03-31 10:22:03 +02:00
darius BERNARD 0e331d5e33 added unittest for bug #156 2015-03-30 17:00:37 +02:00
darius BERNARD ea9ae1176e Merge remote-tracking branch 'upstream/master'
Conflicts:
	django_select2/widgets.py
2015-03-30 16:33:18 +02:00
darius BERNARD 8e5d988e89 fix on 4.2.2 with django 1.7 : is_hidden = True
with django 1.7, is hidden in no loger an attribute
but a property which compare input_type with "hidden"
this commit make sur that is_hidden will always be False

can be merged in 4.2.2
2015-03-30 11:35:36 +02:00
Johannes Hoppe 2cfbfd3325 Code cleanup -- Added pep8 tests for package. 2015-03-30 10:19:37 +02:00
Johannes Hoppe 18fa453ac0 Added initial tests 2015-03-29 22:32:19 +02:00
Ben Cail 91dad724fb Adds render_inner_js_code to HeavySelect2TagWidget
Add a test for HeavyModelSelect2TagField in the testapp.
The labels for selected options aren't displayed correctly in the test.
I updated HeavySelect2TagWidget to override render_inner_js_code, and now it seems to work properly.

Closes #133

Squashed commit of the following:

commit 94895a8743b0c4ebdf888da08827486106a5b15d
Author: Ben Cail <benjamin_cail@brown.edu>
Date:   Tue Nov 18 15:11:24 2014 -0500

    use view name instead of hard-coded url

commit fb9e1444ed73f2c8bad071182e8919dbf4f6bfe6
Author: Ben Cail <benjamin_cail@brown.edu>
Date:   Mon Nov 17 14:31:50 2014 -0500

    override render_inner_js_code in HeavySelect2TagWidget (similar to AutoHeavySelect2Mixin)

commit feff9c2a76474121aa2ff9c9b98a4f7dbfb0ab49
Author: Ben Cail <benjamin_cail@brown.edu>
Date:   Mon Nov 17 14:21:29 2014 -0500

    add test for HeavyModelSelect2TagField
2015-02-24 10:15:13 +01:00
AppleGrew f637d4ec49 Merge pull request #129 from shchemelevev/unnecessary_db_request
Remove unnecessary db request
2014-10-07 18:07:49 +05:30
Evgenii Shchemelev e8580ed23d removed unnecessary db request 2014-10-07 18:01:49 +06:00
AppleGrew a853ae52a9 Merge pull request #127 from rizumu/formset-support
Formset support
2014-09-24 14:55:10 +05:30
Thomas Schreiber c2abdbd63f do not replace dashes on the selector id variable 2014-09-13 16:12:21 +02:00
Thomas Schreiber 1b57be5cd5 do not replace dashes on the selector variable 2014-09-13 16:05:04 +02:00
Thomas Schreiber 8d76a61791 prevent dashes in javascript variable names 2014-09-13 15:16:20 +02:00
Thomas Schreiber e0686628d7 add the hashed field_id to the 'data-select2-id' attr 2014-09-13 03:04:44 +02:00
Thomas Schreiber 36bac0570f Support dynamic inline formsets w/ select2 fields.
* Previously, when using {{ form.empty_form }} the inline js would
    automatically be called on the `empty_form`. This made it impossible
    to dynamically add inlines to the page because of how
    `__prefix__` is duplicated to the new inlines.

    This commit wraps all the inline js in a function which is attached
    to global `window.django_select2` plugin. On page load only non
    `empty_form`'s are initialized with select2, giving the developer to
    attach to the 'add new inline' click and call the `django_select2`
    plugin with the proper inline formset id. I am using this now with
    `django-superformset` and dynamically inserted inlines that contain
    select2 fields are working as expected.

    Additionally all the inline js for each formset is identicaly, a
    future cleanup could be to only inline the field and form id
    variables.

  * First converted `widgets.py` to Unix file type so the diff does not
    contain windows line endings.

  * Since all the inline js is now run post page load, we can put all of
    the`django_select2` js libraries at the page bottom with other js assets.
    refs #51

  * As a bonus, this removes all the js code generation libs from utils with
    json.dumps().

  * I have not tried formsets with the django admin, however this work
    will allow inline formsets support to be added to the admin with
    less developer effort than before.

Refs: #125, #65, #49, #32, #109
2014-09-11 22:58:17 +02:00