Navigation

Changeset 547

Timestamp:

08/15/07 22:58:03 (1 year ago)

Author:

brian

Message:

added genshi to dependencies, still sorting out our new mapper inheritance

Files:

r543	r547
125	125	for table in self.tables]
126	126
127		# id_clauses = [revision_table.c.revision_id == table.c.revision_id
128		# for table in self.tables]
	127	id_clauses = [revision_table.c.revision_id == table.c.revision_id
	128	for table in self.tables]
129	129
130	130	selectable = select(
131	131	select_columns,
132	132	and_(
133		# content_table.c.content_id == revision_table.c.content_id,
	133	content_table.c.content_id == revision_table.c.content_id,
134	134
135	135	# Ensure that the `revision_id` from `revision_table` matches
…	…
138	138	# not being used.
139	139
140		# or_(*id_clauses),
	140	or_(*id_clauses),
141	141	*in_clauses
142	142	),

r542	r547
29	29	@expose()
30	30	def add(self, content_type, **kwargs):
31		~~pass~~
	31	raise NotImplementedError
32	32
33	33	@expose(allow_json=True)
…	…
35	35	if not self.content.is_deleted:
36	36	transaction = models.session.create_transaction()
	37	deleted_content = self.content.delete_node()
37	38	try:
38		~~deleted_content = self.content.new_revision(~~
39		~~is_deleted=True, revision_status=workflow.PENDING~~
40		)
41	39	transaction.commit()
42	40	except models.exceptions.SQLAlchemyError:

r546	r547
8	8
9	9	page_generic_table = Table('page_generic', metadata,
10		Column('revision_id', None, primary_key=True),
	10	Column('revision_id', None, ForeignKey(Revision.c.revision_id),
	11	primary_key=True
	12	),
11	13	Column('nav_show', Boolean, nullable=False, default=True),
12		~~ForeignKeyConstraint(['revision_id'], [Revision.c.revision_id])~~
13	14	)
14	15
15	16	page_localized_table = Table('page_localized', metadata,
16		Column('revision_id', None, primary_key=True),
	17	Column('revision_id', None, ForeignKey(Revision.c.revision_id),
	18	primary_key=True
	19	),
17	20	Column('content_locale', String(8), nullable=False),
18	21	Column('title', Unicode(200), nullable=True),
19		~~ForeignKeyConstraint(['revision_id'], [Revision.c.revision_id])~~
20	22	)
21	23
…	…
37	39	polymorphic_on=page_table.c.content_type,
38	40	polymorphic_identity='page',
39		inherit_condition=or_(
40		page_table.c.revision_id == node_table.c.revision_id,
41		page_table.c.revision_id == page_generic_table.c.revision_id,
42		page_table.c.revision_id == page_localized_table.c.revision_id
43		)
	41	inherit_condition=page_table.c.node_revision_id == Node.c.revision_id,
44	42	)

r502	r547
34	34	"SQLObject", # TODO: Remove this when TurboGears fixes 'tg-admin shell'
35	35	"TurboGears >= 1.0.3",
	36	"Genshi >= 0.4",
36	37	"ToscaWidgets == 0.1a2dev-r2937",
37	38	"SQLAlchemy >= 0.3.8",