# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1242052122 -7200
# Node ID ee3ca4745fc30b9a9bc85deeb2a14f8e61961d07
# Parent  296f0eda7f67412aff4e38660fe502ad63557feb# Parent  08918409815e5c35e0afe0b3f101191a313ed15b
merge

diff -r 296f0eda7f67 -r ee3ca4745fc3 rtags.py
--- a/rtags.py	Mon May 11 14:46:26 2009 +0200
+++ b/rtags.py	Mon May 11 16:28:42 2009 +0200
@@ -41,7 +41,7 @@
                 raise AssertionError('either stype or rtype should have the '
                                      'role mark ("!")')
         else:
-            assert tagged in ('subject', 'object'), tagged
+            assert tagged in ('subject', 'object'), repr(tagged)
         return stype, otype, tagged
 
     def _get_keys(self, stype, rtype, otype, tagged=None):
diff -r 296f0eda7f67 -r ee3ca4745fc3 web/views/autoform.py
--- a/web/views/autoform.py	Mon May 11 14:46:26 2009 +0200
+++ b/web/views/autoform.py	Mon May 11 16:28:42 2009 +0200
@@ -60,7 +60,7 @@
                         X, Y = tschema, eschema
                         card = rschema.rproperty(X, Y, 'cardinality')[1]
                         composed = rschema.rproperty(X, Y, 'composite') == 'subject'
-                    if not cls.rcategories.get(rschema, role, X, Y):
+                    if not cls.rcategories.get(X, rschema, Y, role):
                         if eschema.is_metadata(rschema):
                             category = 'generated'
                         elif card in '1+':
diff -r 296f0eda7f67 -r ee3ca4745fc3 web/views/boxes.py
--- a/web/views/boxes.py	Mon May 11 14:46:26 2009 +0200
+++ b/web/views/boxes.py	Mon May 11 16:28:42 2009 +0200
@@ -53,7 +53,7 @@
                     else:
                         X, Y = tschema, eschema
                         card = rschema.rproperty(X, Y, 'cardinality')[1]
-                    if not cls.rmode.get(rschema, role, X, Y):
+                    if not cls.rmode.get(X, rschema, Y, role):
                         if card in '?1':
                             # by default, suppose link mode if cardinality doesn't allow
                             # more than one relation
diff -r 296f0eda7f67 -r ee3ca4745fc3 web/views/primary.py
--- a/web/views/primary.py	Mon May 11 14:46:26 2009 +0200
+++ b/web/views/primary.py	Mon May 11 16:28:42 2009 +0200
@@ -43,7 +43,7 @@
                         X, Y = tschema, eschema
                         card = rschema.rproperty(X, Y, 'cardinality')[1]
                         composed = rschema.rproperty(X, Y, 'composite') == 'subject'
-                    displayinfo = cls.rdisplay.get(rschema, role, X, Y)
+                    displayinfo = cls.rdisplay.get(X, rschema, Y, role)
                     if displayinfo is None:
                         if rschema.is_final():
                             if rschema.meta or tschema.type in ('Password', 'Bytes'):