imip-agent

Changeset

1278:b4072888250f
2017-09-30 Paul Boddie raw files shortlog changelog graph Merged changes from the parent branch. add-fallback-tzid-to-objects
     1.1 --- a/imipweb/data.py	Tue Sep 19 23:45:57 2017 +0200
     1.2 +++ b/imipweb/data.py	Sat Sep 30 01:27:58 2017 +0200
     1.3 @@ -71,6 +71,10 @@
     1.4          self.cancelled = cancelled
     1.5          self.recurrenceid = recurrenceid
     1.6  
     1.7 +        # Additional editing state.
     1.8 +
     1.9 +        self.new_replacement = False
    1.10 +
    1.11      def as_tuple(self):
    1.12          return self.start, self.end, self.tzid, self.origin, self.start_attr, \
    1.13                 self.end_attr, self.form_start, self.form_end, self.replacement, \
    1.14 @@ -162,6 +166,7 @@
    1.15          self.replacement = replacement
    1.16          self.cancelled = cancelled
    1.17          self.recurrenceid = recurrenceid
    1.18 +        self.new_replacement = False
    1.19  
    1.20      def as_tuple(self):
    1.21          return self.start, self.end, self.end_enabled, self.times_enabled, \
    1.22 @@ -501,8 +506,12 @@
    1.23                  removed.append(sp)
    1.24              elif p != sp or p.replacement:
    1.25                  changed.append(p)
    1.26 +                if not p.replacement:
    1.27 +                    p.new_replacement = True
    1.28              else:
    1.29                  unchanged.append(p)
    1.30 +                if p.new_replacement:
    1.31 +                    p.new_replacement = False
    1.32          elif p:
    1.33              new.append(p)
    1.34