Merge branch 'v2.1' into v2.2

Conflicts:
	chimere/admin.py
	chimere/models.py

1 files changed, 6 insertions, 4 deletions

diff --git a/chimere/utils.py b/chimere/utils.py
index 55fc45c..c5c59e9 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -100,7 +100,7 @@ class ImportManager(object):
                     return ref_item, None, None
                 if not self.importer_instance.overwrite \
                    and ref_item.modified_since_import:
-                    dct_import['ref_item'] = ref_item
+                    return ref_item, None, None
                 else:
                     item = ref_item
                     for k in values:
@@ -124,13 +124,14 @@ class ImportManager(object):
                                      self.importer_instance.default_description
             values.update({
                 'import_source':self.importer_instance.source})
-            values['status'] = 'I' \
-                        if not self.importer_instance.automatic_update else 'A'
+            values['status'] = self.importer_instance.default_status
             if not self.importer_instance.associate_marker_to_way\
               and cls.__name__ == 'Route':
                 values['has_associated_marker'] = False
             try:
                 item = cls.objects.create(**values)
+                item.modified_since_import = False
+                item.save()
             except TypeError:
                 # error on data source
                 return None, False, False
@@ -1063,7 +1064,8 @@ class HtmlXsltManager(ImportManager):
            not "point" in item and not ("lat" in item and item['lat']):
             return
         cls = None
-        dct = {'origin':"<a href='%s'>%s</a>" % (item['link'],
+        dct = {'origin':"<a href='%s' target='_blank'>%s</a>" % (
+                                    item.get('link') or '#',
                                     self.importer_instance.origin),
                'license':self.importer_instance.license,
                'name':item['name']}