[Mpuls-commits] r313 - in wasko/trunk: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-02-27 09:41:41 +0100 (Fri, 27 Feb 2009)
New Revision: 313

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/model/navigation.py
Log:
Fixed bug with navigation contains errors.


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-02-26 16:01:32 UTC (rev 312)
+++ wasko/trunk/ChangeLog.txt	2009-02-27 08:41:41 UTC (rev 313)
@@ -1,3 +1,10 @@
+2009-02-27	Sascha L. Teichmann <teichmann at intevation.de>
+
+	* waskaweb/model/navigation.py: Fixed bug when rendering
+	  navigation with errors. All branches of the case where
+	  open and uncloseable. Only the branches with error
+	  should show this behavior.
+
 2009-02-26	Sascha L. Teichmann <teichmann at intevation.de>
 
 	Increased the usability of the phase overview page.

Modified: wasko/trunk/waskaweb/model/navigation.py
===================================================================
--- wasko/trunk/waskaweb/model/navigation.py	2009-02-26 16:01:32 UTC (rev 312)
+++ wasko/trunk/waskaweb/model/navigation.py	2009-02-27 08:41:41 UTC (rev 313)
@@ -78,11 +78,12 @@
             cur = cur.parent
 
     def render(self, page, out, get_image, error_lookup):
+
         out.append(u'<li class="formpage">')
         out.append(page == self.key \
             and u'<span class="formpage_highlight">' or u'<span>')
 
-        has_error = self.name in error_lookup
+        has_error = self in error_lookup
         if self.is_child():
 
             select_link = SELECT_ITEM % self.key
@@ -156,7 +157,7 @@
                 if child.build_error_lookup(lookup, error_pages):
                     mark = True
         if mark:
-            lookup.add(self.name)
+            lookup.add(self)
         return mark
 
     def get_description_chain(self, form_data):