Skip to content

Commit c0e0b7c

Browse files
author
Richard Jones
committed
whoops
1 parent cd28755 commit c0e0b7c

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

roundup/backends/rdbms_common.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: rdbms_common.py,v 1.165 2006-02-06 21:00:47 richard Exp $
1+
Id$
22
''' Relational database (SQL) backend common code.
33
44
Basics:
@@ -181,9 +181,9 @@ def post_init(self):
181181
We should now confirm that the schema defined by our "classes"
182182
attribute actually matches the schema in the database.
183183
'''
184-
save = self.upgrade_db()
184+
save = 0
185185

186-
# now detect changes in the schema
186+
# handle changes in the schema
187187
tables = self.database_schema['tables']
188188
for classname, spec in self.classes.items():
189189
if tables.has_key(classname):
@@ -202,6 +202,10 @@ def post_init(self):
202202
del tables[classname]
203203
save = 1
204204

205+
# now upgrade the database for column type changes, new internal
206+
# tables, etc.
207+
save = save | self.upgrade_db()
208+
205209
# update the database version of the schema
206210
if save:
207211
self.save_dbschema()

templates/minimal/html/page.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,13 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
7474
</td>
7575
<td>
7676
<p tal:condition="options/error_message | nothing" class="error-message"
77-
tal:repeat="m options/error_message" tal:content="structure m">error</p>
78-
<p tal:condition="options/ok_message | nothing" class="ok-message"
79-
tal:repeat="m options/ok_message" tal:content="structure m">error</p>
77+
tal:repeat="m options/error_message" tal:content="structure m" />
78+
<p tal:condition="options/ok_message | nothing" class="ok-message">
79+
<span tal:repeat="m options/ok_message"
80+
tal:content="structure string:$m <br/ > " />
81+
<a class="form-small" tal:attributes="href string:issue${context/id}"
82+
i18n:translate="">clear this message</a>
83+
</p>
8084
</td>
8185
</tr>
8286
<tr>

0 commit comments

Comments
 (0)