1.1 --- a/imiptools/stores/database/common.py Sun Oct 15 01:03:14 2017 +0200
1.2 +++ b/imiptools/stores/database/common.py Mon Oct 16 22:09:15 2017 +0200
1.3 @@ -174,22 +174,7 @@
1.4 result = self.cursor.fetchone()
1.5 return result and Object(parse_string(result[0], "utf-8"))
1.6
1.7 - def get_complete_event(self, user, uid):
1.8 -
1.9 - "Get the event for the given 'user' with the given 'uid'."
1.10 -
1.11 - columns = ["store_user", "object_uid"]
1.12 - values = [user, uid]
1.13 -
1.14 - query, values = self.get_query(self.with_tables(
1.15 - "select object_text from %(objects)s :condition"),
1.16 - columns, values)
1.17 -
1.18 - self.cursor.execute(query, values)
1.19 - result = self.cursor.fetchone()
1.20 - return result and Object(parse_string(result[0], "utf-8"))
1.21 -
1.22 - def set_complete_event(self, user, uid, node):
1.23 + def set_parent_event(self, user, uid, node):
1.24
1.25 "Set an event for 'user' having the given 'uid' and 'node'."
1.26
1.27 @@ -204,7 +189,7 @@
1.28
1.29 self.cursor.execute(query, values)
1.30
1.31 - if self.cursor.rowcount > 0 or self.get_complete_event(user, uid):
1.32 + if self.cursor.rowcount > 0 or self.get_event(user, uid):
1.33 return True
1.34
1.35 columns = ["store_user", "object_uid", "object_text", "status"]
1.36 @@ -354,7 +339,7 @@
1.37 if recurrenceid:
1.38 return self.get_recurrence_table(dirname)
1.39 else:
1.40 - return self.get_complete_event_table(dirname)
1.41 + return self.get_parent_event_table(dirname)
1.42
1.43 def get_event_table_filters(self, dirname=None):
1.44
1.45 @@ -365,7 +350,7 @@
1.46 else:
1.47 return ["status"], ["active"]
1.48
1.49 - def get_complete_event_table(self, dirname=None):
1.50 + def get_parent_event_table(self, dirname=None):
1.51
1.52 "Get the table providing events for any specified 'dirname'."
1.53