# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1506727678 -7200
# Node ID b4072888250fa416654b8b2ccc3771a6533132d0
# Parent  589108aebee7cb97a67f96ba976e7d10a2f89c47# Parent  d2d07acdcfda6a7bb90bd795b1033aacea178535
Merged changes from the parent branch.

diff -r 589108aebee7 -r b4072888250f imipweb/data.py
--- a/imipweb/data.py	Tue Sep 19 23:45:57 2017 +0200
+++ b/imipweb/data.py	Sat Sep 30 01:27:58 2017 +0200
@@ -71,6 +71,10 @@
         self.cancelled = cancelled
         self.recurrenceid = recurrenceid
 
+        # Additional editing state.
+
+        self.new_replacement = False
+
     def as_tuple(self):
         return self.start, self.end, self.tzid, self.origin, self.start_attr, \
                self.end_attr, self.form_start, self.form_end, self.replacement, \
@@ -162,6 +166,7 @@
         self.replacement = replacement
         self.cancelled = cancelled
         self.recurrenceid = recurrenceid
+        self.new_replacement = False
 
     def as_tuple(self):
         return self.start, self.end, self.end_enabled, self.times_enabled, \
@@ -501,8 +506,12 @@
                 removed.append(sp)
             elif p != sp or p.replacement:
                 changed.append(p)
+                if not p.replacement:
+                    p.new_replacement = True
             else:
                 unchanged.append(p)
+                if p.new_replacement:
+                    p.new_replacement = False
         elif p:
             new.append(p)