[Roundup-checkins] CVS: roundup/roundup/cgi templating.py, 1.251, 1.252

[Ralf S. <sch...@us...>]

Update of /cvsroot/roundup/roundup/roundup/cgi
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13605/cgi

Modified Files:
	templating.py 
Log Message:
grouping by ID and grouping by transitive multilinks didn't work correctly.


Index: templating.py
===================================================================
RCS file: /cvsroot/roundup/roundup/roundup/cgi/templating.py,v
retrieving revision 1.251
retrieving revision 1.252
diff -C2 -r1.251 -r1.252
*** templating.py	6 Sep 2006 08:14:59 -0000	1.251
--- templating.py	8 Sep 2006 19:28:37 -0000	1.252
***************
*** 801,804 ****
--- 801,806 ----
          if htmlprop is not None:
              if has_rest:
+                 if isinstance(htmlprop, MultilinkHTMLProperty):
+                     return [h[items[1]] for h in htmlprop]
                  return htmlprop[items[1]]
              return htmlprop
***************
*** 2514,2520 ****
              return 1
          for property in properties:
!             if (self.last_item[property]._value !=
!                 self.current_item[property]._value):
!                 return 1
          return 0
  
--- 2516,2526 ----
              return 1
          for property in properties:
!             if property == 'id':
!                 if (self.last_item['id'] != self.current_item['id']):
!                     return 1
!             else:
!                 if (self.last_item[property]._value !=
!                     self.current_item[property]._value):
!                     return 1
          return 0