# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1246285087 -7200
# Node ID c8c8ef5c5c6563b7f95bdfa0c8b546f417e18e4f
# Parent  667b6340bfd49c0b5e6de6e6e8343844c72d4d5e# Parent  d9f5fd1879fc2ae40c11cd6297065cb879038439
merge

diff -r d9f5fd1879fc -r c8c8ef5c5c65 server/repository.py
--- a/server/repository.py	Mon Jun 29 16:09:35 2009 +0200
+++ b/server/repository.py	Mon Jun 29 16:18:07 2009 +0200
@@ -343,7 +343,6 @@
                             'connections pools size)')
 
     def _free_pool(self, pool):
-        pool.rollback()
         self._available_pools.put_nowait(pool)
 
     def pinfo(self):
diff -r d9f5fd1879fc -r c8c8ef5c5c65 web/uicfg.py
--- a/web/uicfg.py	Mon Jun 29 16:09:35 2009 +0200
+++ b/web/uicfg.py	Mon Jun 29 16:18:07 2009 +0200
@@ -129,6 +129,21 @@
         self._counter += 1
         tag.setdefault('order', self._counter)
 
+    def tag_subject_of(self, key, tag):
+        subj, rtype, obj = key
+        if obj != '*':
+            self.warning('using explict target type in display_ctrl.tag_subject_of() '
+                         'has no effect, use (%s, %s, "*") instead of (%s, %s, %s)',
+                         subj, rtype, subj, rtype, obj)
+        super(DisplayCtrlRelationTags, self).tag_subject_of((subj, rtype, '*'), tag)
+
+    def tag_object_of(self, key, tag):
+        subj, rtype, obj = key
+        if subj != '*':
+            self.warning('using explict subject type in display_ctrl.tag_object_of() '
+                         'has no effect, use ("*", %s, %s) instead of (%s, %s, %s)',
+                         rtype, obj, subj, rtype, obj)
+        super(DisplayCtrlRelationTags, self).tag_object_of(('*', rtype, obj), tag)
 
 def init_primaryview_display_ctrl(rtag, sschema, rschema, oschema, role):
     if role == 'subject':
diff -r d9f5fd1879fc -r c8c8ef5c5c65 web/views/__init__.py
--- a/web/views/__init__.py	Mon Jun 29 16:09:35 2009 +0200
+++ b/web/views/__init__.py	Mon Jun 29 16:18:07 2009 +0200
@@ -53,9 +53,15 @@
             return True
     return False
 
-VID_BY_MIMETYPE = {'text/xml': 'xml',
-                   # XXX rss, owl...
-                  }
+# FIXME: VID_BY_MIMETYPE is unfortunately a bit too naive since
+#        some browsers (e.g. FF2) send a bunch of mimetypes in
+#        the Accept header, for instance:
+#          text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,
+#          text/plain;q=0.8,image/png,*/*;q=0.5
+VID_BY_MIMETYPE = {
+    #'text/xml': 'xml',
+    # XXX rss, owl...
+}
 def vid_from_rset(req, rset, schema):
     """given a result set, return a view id"""
     if rset is None: