# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1265978112 -3600
# Node ID 23e0632df61522ae7db9de9dd240e38d668c3ca9
# Parent  43c14e0e897215a92dbbd700c026f83d4fa64519# Parent  79f461d7ec3729f44041d0a3c1ab8961c1eb134e
merge 3.6 default/stable

diff -r 43c14e0e8972 -r 23e0632df615 web/formwidgets.py
--- a/web/formwidgets.py	Fri Feb 12 12:57:56 2010 +0100
+++ b/web/formwidgets.py	Fri Feb 12 13:35:12 2010 +0100
@@ -722,11 +722,14 @@
                 value = req.form[field.name]
             else:
                 value = self.typed_value(form, field)
-            try:
-                path, qs = value.split('?', 1)
-            except ValueError:
-                path = value
-                qs = ''
+            if value:
+                try:
+                    path, qs = value.split('?', 1)
+                except ValueError:
+                    path = value
+                    qs = ''
+            else:
+                path = qs = ''
             fqs = u'\n'.join(u'%s=%s' % (k, v) for k, v in req.url_parse_qsl(qs))
         attrs = dict(self.attrs)
         if self.setdomid:
diff -r 43c14e0e8972 -r 23e0632df615 web/views/treeview.py
--- a/web/views/treeview.py	Fri Feb 12 12:57:56 2010 +0100
+++ b/web/views/treeview.py	Fri Feb 12 13:35:12 2010 +0100
@@ -59,8 +59,12 @@
             self._init_headers(treeid, toplevel_thru_ajax)
             ulid = ' id="tree-%s"' % treeid
         self.w(u'<ul%s class="%s">' % (ulid, self.css_classes))
+        # XXX force sorting on x.sortvalue() (which return dc_title by default)
+        # we need proper ITree & co specification to avoid this.
+        # (pb when type ambiguity at the other side of the tree relation,
+        # unability to provide generic implementation on eg Folder...)
         for i, entity in enumerate(sorted(self.cw_rset.entities(),
-                                          key=lambda x: x.dc_title())):
+                                          key=lambda x: x.sortvalue())):
             if i+1 < len(self.cw_rset):
                 morekwargs['is_last'] = False
             else: