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
19d1cb14
Kaydet (Commit)
19d1cb14
authored
Ock 27, 2016
tarafından
Tim Graham
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fixed #20415 -- Ensured srid isn't localized in OpenLayers JavaScript.
üst
5aa53286
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
openlayers.html
django/contrib/gis/templates/gis/openlayers.html
+3
-2
1.8.9.txt
docs/releases/1.8.9.txt
+3
-0
1.9.2.txt
docs/releases/1.9.2.txt
+3
-0
test_geoforms.py
tests/gis_tests/test_geoforms.py
+4
-1
No files found.
django/contrib/gis/templates/gis/openlayers.html
Dosyayı görüntüle @
19d1cb14
<style
type=
"text/css"
>
{
%
block
map_css
%
}{
%
load
i18n
static
%
}{
%
get_current_language_bidi
as
LANGUAGE_BIDI
%
}
{% load i18n l10n static %}
<style
type=
"text/css"
>
{
%
block
map_css
%
}{
%
get_current_language_bidi
as
LANGUAGE_BIDI
%
}
#
{
{
id
}
}
_map
{
width
:
{{
map_width
}
}
px
;
height
:
{
{
map_height
}
}
px
;
}
#
{
{
id
}
}
_map
.aligned
label
{
float
:
inherit
;
}
#
{
{
id
}
}
_div_map
{
position
:
relative
;
vertical-align
:
top
;
float
:
{{
LANGUAGE_BIDI
|
yesno
:
"right,left"
}
}
;
}
...
...
@@ -25,7 +26,7 @@
id
:
'{{ id }}'
,
map_id
:
'{{ id }}_map'
,
map_options
:
map_options
,
map_srid
:
{{
map_srid
}},
map_srid
:
{{
map_srid
|
unlocalize
}},
name
:
'{{ name }}'
};
{
%
endblock
%
}
...
...
docs/releases/1.8.9.txt
Dosyayı görüntüle @
19d1cb14
...
...
@@ -34,3 +34,6 @@ Bugfixes
* Fixed a regression in Django 1.8.5 that broke copying a ``SimpleLazyObject``
with ``copy.copy()`` (:ticket:`26122`).
* Fixed the ``contrib.gis`` map widgets when using
``USE_THOUSAND_SEPARATOR=True`` (:ticket:`20415`).
docs/releases/1.9.2.txt
Dosyayı görüntüle @
19d1cb14
...
...
@@ -88,3 +88,6 @@ Bugfixes
* Always included ``geometry_field`` in the GeoJSON serializer output regardless
of the ``fields`` parameter (:ticket:`26138`).
* Fixed the ``contrib.gis`` map widgets when using
``USE_THOUSAND_SEPARATOR=True`` (:ticket:`20415`).
tests/gis_tests/test_geoforms.py
Dosyayı görüntüle @
19d1cb14
...
...
@@ -4,7 +4,7 @@ from django.contrib.gis import forms
from
django.contrib.gis.gdal
import
HAS_GDAL
from
django.contrib.gis.geos
import
GEOSGeometry
from
django.forms
import
ValidationError
from
django.test
import
SimpleTestCase
,
skipUnlessDBFeature
from
django.test
import
SimpleTestCase
,
override_settings
,
skipUnlessDBFeature
from
django.utils
import
six
from
django.utils.html
import
escape
...
...
@@ -152,6 +152,7 @@ class SpecializedFieldTest(SimpleTestCase):
self
.
assertTrue
(
form_instance
.
is_valid
())
rendered
=
form_instance
.
as_p
()
self
.
assertIn
(
'new MapWidget(options);'
,
rendered
)
self
.
assertIn
(
'map_srid: 4326,'
,
rendered
)
self
.
assertIn
(
'gis/js/OLMapWidget.js'
,
str
(
form_instance
.
media
))
def
assertTextarea
(
self
,
geom
,
rendered
):
...
...
@@ -161,6 +162,8 @@ class SpecializedFieldTest(SimpleTestCase):
self
.
assertIn
(
'required'
,
rendered
)
self
.
assertIn
(
geom
.
wkt
,
rendered
)
# map_srid in operlayers.html template must not be localized.
@override_settings
(
USE_L10N
=
True
,
USE_THOUSAND_SEPARATOR
=
True
)
def
test_pointfield
(
self
):
class
PointForm
(
forms
.
Form
):
p
=
forms
.
PointField
()
...
...
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