witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Changed the order of exported HTML and CSV notebooks so that after all the "startup" notes are included, the remaining notes are included in alphabetical order (instead of reverse chronological order).

This commit is contained in:
Dan Helfman 2009-02-24 12:52:44 -08:00
parent 53c26c6037
commit 4d00c92e3a
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,4 +1,7 @@
1.6.8: ?
* Changed the order of exported HTML and CSV notebooks so that after all the
"startup" notes are included, the remaining notes are included in
alphabetical order (instead of reverse chronological order).
* Fixed a compatibility problem with newer versions of SQLite. (Luminotes
was using a reserved keyword as an identifier.) This only affected those
people who installed Luminotes Server themselves.

4
controller/test/Test_notebooks.py
View File

@ -4512,7 +4512,7 @@ class Test_notebooks( Test_controller ):
startup_note_allowed = True
previous_revision = None
# assert that startup notes come first, then normal notes in descending revision order
# assert that startup notes come first, then normal notes in alphabetical order
for note in notes:
if note.startup:
assert startup_note_allowed
@ -4592,7 +4592,7 @@ class Test_notebooks( Test_controller ):
startup_note_allowed = True
previous_revision = None
# assert that startup notes come first, then normal notes in descending revision order
# assert that startup notes come first, then normal notes in alphabetical order
for row in reader:
note_count += 1

2
model/Notebook.py
View File

@ -172,7 +172,7 @@ class Notebook( Persistent ):
"""
Return a SQL string to load a list of the non-startup notes within this notebook.
"""
return "select id, revision, title, contents, notebook_id, startup, deleted_from_id, rank, user_id from note_current where notebook_id = %s and startup = 'f' order by revision desc;" % quote( self.object_id )
return "select id, revision, title, contents, notebook_id, startup, deleted_from_id, rank, user_id from note_current where notebook_id = %s and startup = 'f' order by lower( title );" % quote( self.object_id )
def sql_load_startup_notes( self ):
"""