- Backport from master

GeoNode · May 28, 2018 · e54eb92 · e54eb92
1 parent d43a389
commit e54eb92
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/geonode/client/templates/geoext/layers/layer_geoext_map.html b/geonode/client/templates/geoext/layers/layer_geoext_map.html
@@ -168,14 +168,14 @@
 
                            var zoomToData = function()
                            {
-                               map.zoomToExtent(extent, true);
+                               map.zoomToExtent(extent, false);
                                app.mapPanel.center = map.center;
                                app.mapPanel.zoom = map.zoom;
                                map.events.unregister('changebaselayer', null, zoomToData);
                            };
                            map.events.register('changebaselayer',null,zoomToData);
                            if(map.baseLayer){
-                               map.zoomToExtent(extent, true);
+                               map.zoomToExtent(extent, false);
                            }
                         }
                     },

diff --git a/geonode/client/templates/geoext/layers/layer_geoext_map_mini.html b/geonode/client/templates/geoext/layers/layer_geoext_map_mini.html
@@ -162,14 +162,14 @@
 
                            var zoomToData = function()
                            {
-                               map.zoomToExtent(extent, true);
+                               map.zoomToExtent(extent, false);
                                app.mapPanel.center = map.center;
                                app.mapPanel.zoom = map.zoom;
                                map.events.unregister('changebaselayer', null, zoomToData);
                            };
                            map.events.register('changebaselayer',null,zoomToData);
                            if(map.baseLayer){
-                               map.zoomToExtent(extent, true);
+                               map.zoomToExtent(extent, false);
                            }
                         }
                     },

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -899,7 +899,7 @@
 GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY', None)
 
 # handle timestamps like 2017-05-30 16:04:00.719 UTC
-if django.VERSION[0] == 1 and django.VERSION[1] >= 11:
+if django.VERSION[0] == 1 and django.VERSION[1] >= 9:
     _DATETIME_INPUT_FORMATS = ['%Y-%m-%d %H:%M:%S.%f %Z', '%Y-%m-%dT%H:%M:%S.%f', '%Y-%m-%dT%H:%M:%S%Z']
 else:
     _DATETIME_INPUT_FORMATS = ('%Y-%m-%d %H:%M:%S.%f %Z', '%Y-%m-%dT%H:%M:%S.%f', '%Y-%m-%dT%H:%M:%S%Z')