Commit 8bd7f72

predatellcodingjoe

authored and

committed

Try to get queryset form choices, if possible (applegrew#509)

Get queryset for model widgets from choices. This omits the need to explicitly supply a queryset or model to the widget.

1 parent 6b1ca10 commit 8bd7f72Copy full SHA for 8bd7f72

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,8 @@ def get_queryset(self):`
`419`	`419`	`"""`
`420`	`420`	`if self.queryset is not None:`
`421`	`421`	`queryset = self.queryset`
	`422`	`+ elif hasattr(self.choices, 'queryset'):`
	`423`	`+ queryset = self.choices.queryset`
`422`	`424`	`elif self.model is not None:`
`423`	`425`	`queryset = self.model._default_manager.all()`
`424`	`426`	`else:`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,6 @@ class AddressChainedSelect2WidgetForm(forms.Form):`
`186`	`186`	`queryset=Country.objects.all(),`
`187`	`187`	`label='Country',`
`188`	`188`	`widget=ModelSelect2Widget(`
`189`		`- model=Country,`
`190`	`189`	`search_fields=['name__icontains'],`
`191`	`190`	`max_results=500,`
`192`	`191`	`dependent_fields={'city': 'cities'},`
`@@ -198,7 +197,6 @@ class AddressChainedSelect2WidgetForm(forms.Form):`
`198`	`197`	`queryset=City.objects.all(),`
`199`	`198`	`label='City',`
`200`	`199`	`widget=ModelSelect2Widget(`
`201`		`- model=City,`
`202`	`200`	`search_fields=['name__icontains'],`
`203`	`201`	`dependent_fields={'country': 'country'},`
`204`	`202`	`max_results=500,`

Comments

(0)