Skip to content

Commit bd303ef

Browse files
author
Richard Jones
committed
merge from HEAD
1 parent e84efa1 commit bd303ef

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Fixed:
1919
popups (sf bug 1211800)
2020
- handle dropped properies in rdbms/metakit journal export (sf bug 1203569)
2121
- handle missing Subject lines better (sf bug 1198729)
22+
- sort/group by missing values correctly (sf bug 1198623)
2223

2324

2425
2005-05-02 0.8.3

doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ Maciej Starzyk,
146146
Mitchell Surface,
147147
Mike Thompson,
148148
Michael Twomey,
149+
Karl Ulbrich,
149150
Martin Uzak,
150151
Darryl VanDorp,
151152
J Vickroy,

roundup/cgi/templating.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2325,8 +2325,11 @@ def propchanged(self, property):
23252325
''' Detect if the property marked as being the group property
23262326
changed in the last iteration fetch
23272327
'''
2328+
# we poke directly at the _value here since MissingValue can screw
2329+
# us up and cause Nones to compare strangely
23282330
if (self.last_item is None or
2329-
self.last_item[property] != self.current_item[property]):
2331+
self.last_item[property]._value !=
2332+
self.current_item[property]._value):
23302333
return 1
23312334
return 0
23322335

0 commit comments

Comments
 (0)