Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/static/chimere/css/styles.css
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/utils.py
	chimere/views.py
	example_project/settings.py

1 files changed, 26 insertions, 1 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index af342c5..fb48205 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -189,12 +189,31 @@ class KMLImporterTest(TestCase, ImporterTest):
         importer3.categories.add(subcategories[2])
 
         importer4 = Importer.objects.create(importer_type='KML',
-         source=test_dir_path+'tests/sample.kml.zip', zipped=True)
+         source=test_dir_path+'tests/sample.kml.zip', zipped=True,
+         default_description="Default description")
         importer4.categories.add(subcategories[3])
 
         self.marker_importers = [(importer1, 1), (importer2, 3), (importer3, 0),
                                  (importer4, 4)]
 
+    def test_defaultdescription(self):
+        Marker.objects.all().delete()
+        importer = self.marker_importers[-1][0]
+        importer.overwrite = True
+        importer.save()
+        importer.manager.get()
+        last_marker = Marker.objects.order_by('-pk').all()[0]
+        self.assertEqual(last_marker.description,
+                         importer.default_description)
+        # don't overwrite description on update
+        new_desc = u"Description set by an user"
+        last_marker.description = new_desc
+        last_marker.save()
+        importer.manager.get()
+        last_marker = Marker.objects.order_by('-pk').all()[0]
+        self.assertEqual(last_marker.description,
+                         new_desc)
+
 class ShapefileImporterTest(TestCase, ImporterTest):
     def setUp(self):
         self.subcategories = subcategory_setup()
@@ -401,6 +420,12 @@ class NewsTest(TestCase):
     def setUp(self):
         self.areas = areas_setup()
         self.markers = marker_setup()
+        current_date = datetime.datetime.now()
+        marker = Marker.objects.create(name="Marker 4", status='A',
+                      point='SRID=4326;POINT(-4.5 48.45)',
+                      available_date=current_date - datetime.timedelta(days=90),
+                      start_date=current_date - datetime.timedelta(days=90),
+                      end_date=None)
         self.news = []
         self.news.append(News.objects.create(is_front_page=True,
                             title=u"Test news 1", available=True))