Merge remote-tracking branch 'origin/pr/73' into develop

* origin/pr/73: Fixing merge on DateTimeField with null=True Trying to fix Taggit incompatibility
saxix · Nov 7, 2015 · d6d2d8e · d6d2d8e
2 parents 64dc74d + 922b332
commit d6d2d8e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/adminactions/api.py b/adminactions/api.py
@@ -108,10 +108,11 @@ def merge(master, other, fields=None, commit=False, m2m=None, related=None):  #
                     except ObjectDoesNotExist:
                         pass
                 else:
-                    accessor = getattr(other, name)
-                    rel_fieldname = list(accessor.core_filters.keys())[0].split('__')[0]
-                    for r in accessor.all():
-                        all_related[name].append((rel_fieldname, r))
+                    accessor = getattr(other, name, None)
+                    if accessor:
+                        rel_fieldname = list(accessor.core_filters.keys())[0].split('__')[0]
+                        for r in accessor.all():
+                            all_related[name].append((rel_fieldname, r))
 
         if commit:
             for name, elements in list(all_related.items()):

diff --git a/adminactions/merge.py b/adminactions/merge.py
@@ -148,9 +148,15 @@ def raw_widget(field, **kwargs):
                 if isinstance(field, models.DateTimeField):
                     for target in (master, other):
                         raw_value = getattr(target, field.name)
-                        fixed_value = datetime(raw_value.year, raw_value.month, raw_value.day,
-                                               raw_value.hour, raw_value.minute, raw_value.second)
-                        setattr(target, field.name, fixed_value)
+                        if raw_value:
+                            fixed_value = datetime(
+                                raw_value.year,
+                                raw_value.month,
+                                raw_value.day,
+                                raw_value.hour,
+                                raw_value.minute,
+                                raw_value.second)
+                            setattr(target, field.name, fixed_value)
         except ValueError:
             messages.error(request, _('Please select exactly 2 records'))
             return