Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
D
django
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
django
Commits
468d8211
Kaydet (Commit)
468d8211
authored
Ock 14, 2016
tarafından
rynomster
Kaydeden (comit)
Tim Graham
Şub 02, 2016
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fixed #23971 -- Added "Has date"/"No date" choices for DateFieldListFilter.
üst
67907ed8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
1 deletion
+45
-1
AUTHORS
AUTHORS
+1
-0
filters.py
django/contrib/admin/filters.py
+10
-1
1.10.txt
docs/releases/1.10.txt
+3
-0
tests.py
tests/admin_filters/tests.py
+31
-0
No files found.
AUTHORS
Dosyayı görüntüle @
468d8211
...
...
@@ -638,6 +638,7 @@ answer newbie questions, and generally made Django that much better:
ryankanno
Ryan Kelly <ryan@rfk.id.au>
Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>
Ryno Mathee <rmathee@gmail.com>
Sam Newman <http://www.magpiebrain.com/>
Sander Dijkhuis <sander.dijkhuis@gmail.com>
Sarthak Mehrish <sarthakmeh03@gmail.com>
...
...
django/contrib/admin/filters.py
Dosyayı görüntüle @
468d8211
...
...
@@ -331,11 +331,20 @@ class DateFieldListFilter(FieldListFilter):
self
.
lookup_kwarg_until
:
str
(
next_year
),
}),
)
if
field
.
null
:
self
.
lookup_kwarg_isnull
=
'
%
s__isnull'
%
field_path
self
.
links
+=
(
(
_
(
'No date'
),
{
self
.
field_generic
+
'isnull'
:
'True'
}),
(
_
(
'Has date'
),
{
self
.
field_generic
+
'isnull'
:
'False'
}),
)
super
(
DateFieldListFilter
,
self
)
.
__init__
(
field
,
request
,
params
,
model
,
model_admin
,
field_path
)
def
expected_parameters
(
self
):
return
[
self
.
lookup_kwarg_since
,
self
.
lookup_kwarg_until
]
params
=
[
self
.
lookup_kwarg_since
,
self
.
lookup_kwarg_until
]
if
self
.
field
.
null
:
params
.
append
(
self
.
lookup_kwarg_isnull
)
return
params
def
choices
(
self
,
changelist
):
for
title
,
param_dict
in
self
.
links
:
...
...
docs/releases/1.10.txt
Dosyayı görüntüle @
468d8211
...
...
@@ -59,6 +59,9 @@ Minor features
* Selected objects for fields in ``ModelAdmin.raw_id_fields`` now have a link
to object's change form.
* Added "No date" and "Has date" choices for ``DateFieldListFilter`` if the
field is nullable.
:mod:`django.contrib.admindocs`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
tests/admin_filters/tests.py
Dosyayı görüntüle @
468d8211
...
...
@@ -402,6 +402,37 @@ class ListFiltersTests(TestCase):
)
)
# Null/not null queries
request
=
self
.
request_factory
.
get
(
'/'
,
{
'date_registered__isnull'
:
'True'
})
changelist
=
self
.
get_changelist
(
request
,
Book
,
modeladmin
)
# Make sure the correct queryset is returned
queryset
=
changelist
.
get_queryset
(
request
)
self
.
assertEqual
(
queryset
.
count
(),
1
)
self
.
assertEqual
(
queryset
[
0
],
self
.
bio_book
)
# Make sure the correct choice is selected
filterspec
=
changelist
.
get_filters
(
request
)[
0
][
4
]
self
.
assertEqual
(
force_text
(
filterspec
.
title
),
'date registered'
)
choice
=
select_by
(
filterspec
.
choices
(
changelist
),
'display'
,
'No date'
)
self
.
assertEqual
(
choice
[
'selected'
],
True
)
self
.
assertEqual
(
choice
[
'query_string'
],
'?date_registered__isnull=True'
)
request
=
self
.
request_factory
.
get
(
'/'
,
{
'date_registered__isnull'
:
'False'
})
changelist
=
self
.
get_changelist
(
request
,
Book
,
modeladmin
)
# Make sure the correct queryset is returned
queryset
=
changelist
.
get_queryset
(
request
)
self
.
assertEqual
(
queryset
.
count
(),
3
)
self
.
assertEqual
(
list
(
queryset
),
[
self
.
gipsy_book
,
self
.
django_book
,
self
.
djangonaut_book
])
# Make sure the correct choice is selected
filterspec
=
changelist
.
get_filters
(
request
)[
0
][
4
]
self
.
assertEqual
(
force_text
(
filterspec
.
title
),
'date registered'
)
choice
=
select_by
(
filterspec
.
choices
(
changelist
),
'display'
,
'Has date'
)
self
.
assertEqual
(
choice
[
'selected'
],
True
)
self
.
assertEqual
(
choice
[
'query_string'
],
'?date_registered__isnull=False'
)
@unittest.skipIf
(
sys
.
platform
.
startswith
(
'win'
),
"Windows doesn't support setting a timezone that differs from the "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment