Skip to content
This repository was archived by the owner on Nov 29, 2019. It is now read-only.

Review timeline ordering structures #636

Open
maparent wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Review timeline ordering structures #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f52462
Allow type casting; eg int to float...
maparent Dec 21, 2018
9f21be5
remote post_update from TimelineEvent.previous_event; it makes for we…
maparent Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions assembl/lib/sqla.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,10 +1175,14 @@ def _do_update_from_json(
elif isinstance(value, col.type.python_type):
setattr(self, key, value)
else:
assert False, "can't assign json type %s"\
" to column %s of class %s" % (
type(value).__name__, col.key,
self.__class__.__name__)
try:
value_cast = col.type.python_type(value)
setattr(self, key, value_cast)
except Error as e:
assert False, "can't assign json type %s"\
" to column %s of class %s" % (
type(value).__name__, col.key,
self.__class__.__name__)
continue
else:
# Non-scalar
Expand Down
4 changes: 3 additions & 1 deletion assembl/models/timeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,10 @@ class TimelineEvent(DiscussionBoundBase):
'timeline_event.id', ondelete="SET NULL"), nullable=True)

previous_event = relationship(
"TimelineEvent", remote_side=[id], post_update=True, uselist=False,
"TimelineEvent", remote_side=[id], uselist=False,
cascade="save-update, merge, expunge",
backref=backref("next_event", uselist=False,
cascade="save-update, merge, expunge",
remote_side=[previous_event_id]))

def __init__(self, **kwargs):
Expand Down
4 changes: 0 additions & 4 deletions assembl/tests/fixtures/timeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ def timeline_phase2_interface_v1(request, test_app, test_session, discussion, su

def fin():
print "finalizer timeline"
phase2.previous_event = None
phase2.previous_event_id = None
phase2.delete()
phase1.delete()

Expand Down Expand Up @@ -76,8 +74,6 @@ def timeline_phase2_interface_v2(request, test_app, test_session, discussion, su

def fin():
print "finalizer timeline"
phase2.previous_event = None
phase2.previous_event_id = None
phase2.delete()
phase1.delete()
test_session.flush()
Expand Down